Python 3 fixes for CloudStack modules and tests. (#24400)

2026-05-08 06:12:51 +00:00 · 2017-05-09 19:37:08 +08:00
parent 6aa32d3e9d
commit d999d613cb
23 changed files with 25 additions and 29 deletions
--- a/test/integration/targets/cs_cluster/aliases
+++ b/test/integration/targets/cs_cluster/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_configuration/aliases
+++ b/test/integration/targets/cs_configuration/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_configuration/tasks/main.yml
+++ b/test/integration/targets/cs_configuration/tasks/main.yml
@@ -7,7 +7,7 @@
  assert:
    that:
      - config|failed
-      - "config.msg == 'missing required arguments: value,name'"
+      - "config.msg.startswith('missing required arguments: ')"

 - name: test configuration
  cs_configuration:
--- a/test/integration/targets/cs_domain/aliases
+++ b/test/integration/targets/cs_domain/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_firewall/aliases
+++ b/test/integration/targets/cs_firewall/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_instance/aliases
+++ b/test/integration/targets/cs_instance/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_instance_facts/aliases
+++ b/test/integration/targets/cs_instance_facts/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_iso/aliases
+++ b/test/integration/targets/cs_iso/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_loadbalancer_rule/aliases
+++ b/test/integration/targets/cs_loadbalancer_rule/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_loadbalancer_rule/tasks/main.yml
+++ b/test/integration/targets/cs_loadbalancer_rule/tasks/main.yml
@@ -57,7 +57,7 @@
  assert:
    that:
    - lb|failed
-    - "'ip_address,name' in lb.msg"
+    - "lb.msg.startswith('missing required arguments: ')"

 - name: test create rule
  cs_loadbalancer_rule:
@@ -143,7 +143,7 @@
  assert:
    that:
    - lb|failed
-    - "'vms,name' in lb.msg"
+    - "lb.msg.startswith('missing required arguments: ')"

 - name: test add members to rule
  cs_loadbalancer_rule_member:
--- a/test/integration/targets/cs_pod/aliases
+++ b/test/integration/targets/cs_pod/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_portforward/aliases
+++ b/test/integration/targets/cs_portforward/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_portforward/tasks/main.yml
+++ b/test/integration/targets/cs_portforward/tasks/main.yml
@@ -59,7 +59,7 @@
  assert:
    that:
    - pf|failed
-    - 'pf.msg == "missing required arguments: private_port,ip_address,public_port"'
+    - 'pf.msg.startswith("missing required arguments: ")'

 - name: test present port forwarding
  cs_portforward:
--- a/test/integration/targets/cs_project/aliases
+++ b/test/integration/targets/cs_project/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_resourcelimit/aliases
+++ b/test/integration/targets/cs_resourcelimit/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_sshkeypair/aliases
+++ b/test/integration/targets/cs_sshkeypair/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_user/aliases
+++ b/test/integration/targets/cs_user/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_vmsnapshot/aliases
+++ b/test/integration/targets/cs_vmsnapshot/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_vmsnapshot/tasks/main.yml
+++ b/test/integration/targets/cs_vmsnapshot/tasks/main.yml
@@ -29,7 +29,7 @@
  assert:
    that:
    - snap|failed
-    - 'snap.msg == "missing required arguments: vm,name"'
+    - 'snap.msg.startswith("missing required arguments: ")'

 - name: test create snapshot
  cs_vmsnapshot:
--- a/test/integration/targets/cs_volume/aliases
+++ b/test/integration/targets/cs_volume/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3
--- a/test/integration/targets/cs_vpc/aliases
+++ b/test/integration/targets/cs_vpc/aliases
@@ -1,3 +1,2 @@
 cloud/cs
 posix/ci/cloud/cs
-skip/python3