Browse Source

Merge "Add python3 functional gate"

changes/55/674855/1
Zuul 2 months ago
parent
commit
d4e639e2a0
3 changed files with 6 additions and 2 deletions
  1. 2
    0
      .zuul.d/rally-tox-functional.yaml
  2. 3
    2
      tests/functional/test_cli_env.py
  3. 1
    0
      tox.ini

+ 2
- 0
.zuul.d/rally-tox-functional.yaml View File

@@ -17,5 +17,7 @@
17 17
     vars:
18 18
       devstack_plugins:
19 19
         rally-openstack: https://opendev.org/openstack/rally-openstack
20
+      devstack_localrc:
21
+        USE_PYTHON3: true
20 22
       rally_tox_env: "functional"
21 23
     run: tests/ci/playbooks/run-rally-tox.yaml

+ 3
- 2
tests/functional/test_cli_env.py View File

@@ -171,8 +171,9 @@ class EnvTestCase(unittest.TestCase):
171 171
             plugings = "tests/functional/extra/fake_dir/fake_plugin.py"
172 172
             rally("--plugin-paths %s env check" % plugings)
173 173
         except utils.RallyCliError as e:
174
-            self.assertIn("There is no OSClient plugin 'noneclient'",
175
-                          e.output)
174
+            self.assertIn(
175
+                "Plugin existing@openstack.check_health() method is broken",
176
+                e.output)
176 177
 
177 178
     def test_check_api_info_fail_3(self):
178 179
         rally = utils.Rally()

+ 1
- 0
tox.ini View File

@@ -56,6 +56,7 @@ basepython = python3.5
56 56
 commands = oslo_debug_helper -t tests {posargs}
57 57
 
58 58
 [testenv:functional]
59
+basepython = python3
59 60
 sitepackages = True
60 61
 commands =
61 62
   find . -type f -name "*.pyc" -delete

Loading…
Cancel
Save