From a5e3b0512c8c4e5ffbd960b903f40871d1867601 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 6 Jun 2018 16:51:05 -0700 Subject: [PATCH] qa: test py2 and py3 for volume client Signed-off-by: Patrick Donnelly --- qa/suites/fs/basic_functional/tasks/volume-client/% | 0 qa/suites/fs/basic_functional/tasks/volume-client/py/2.yaml | 2 ++ qa/suites/fs/basic_functional/tasks/volume-client/py/3.yaml | 2 ++ .../tasks/{volume-client.yaml => volume-client/test.yaml} | 0 qa/tasks/cephfs/test_volume_client.py | 5 +++++ 5 files changed, 9 insertions(+) create mode 100644 qa/suites/fs/basic_functional/tasks/volume-client/% create mode 100644 qa/suites/fs/basic_functional/tasks/volume-client/py/2.yaml create mode 100644 qa/suites/fs/basic_functional/tasks/volume-client/py/3.yaml rename qa/suites/fs/basic_functional/tasks/{volume-client.yaml => volume-client/test.yaml} (100%) diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/% b/qa/suites/fs/basic_functional/tasks/volume-client/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/py/2.yaml b/qa/suites/fs/basic_functional/tasks/volume-client/py/2.yaml new file mode 100644 index 0000000000000..e3924dd6be414 --- /dev/null +++ b/qa/suites/fs/basic_functional/tasks/volume-client/py/2.yaml @@ -0,0 +1,2 @@ +overrides: + python: python2 diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/py/3.yaml b/qa/suites/fs/basic_functional/tasks/volume-client/py/3.yaml new file mode 100644 index 0000000000000..9bd4a922626c3 --- /dev/null +++ b/qa/suites/fs/basic_functional/tasks/volume-client/py/3.yaml @@ -0,0 +1,2 @@ +overrides: + python: python3 diff --git a/qa/suites/fs/basic_functional/tasks/volume-client.yaml b/qa/suites/fs/basic_functional/tasks/volume-client/test.yaml similarity index 100% rename from qa/suites/fs/basic_functional/tasks/volume-client.yaml rename to qa/suites/fs/basic_functional/tasks/volume-client/test.yaml diff --git a/qa/tasks/cephfs/test_volume_client.py b/qa/tasks/cephfs/test_volume_client.py index 471d74ec34593..06094dd6fe988 100644 --- a/qa/tasks/cephfs/test_volume_client.py +++ b/qa/tasks/cephfs/test_volume_client.py @@ -16,6 +16,11 @@ class TestVolumeClient(CephFSTestCase): CLIENTS_REQUIRED = 4 py_version = 'python' + def setUp(self): + CephFSTestCase.setUp(self) + self.py_version = self.ctx.config.get('overrides', {}).get('python', 'python') + log.info("using python version: %s".format(self.py_version)) + def _volume_client_python(self, client, script, vol_prefix=None, ns_prefix=None): # Can't dedent this *and* the script we pass in, because they might have different # levels of indentation to begin with, so leave this string zero-indented -- 2.39.5