From ff1f04f4d538d3c713d34fa4a77c4ff3eb58e01d Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 18 Jun 2019 15:14:22 -0700 Subject: [PATCH] qa: elide python version config This test doesn't actually use the config and cephfs-shell is py3 only. Signed-off-by: Patrick Donnelly --- .../tasks/{cephfs-shell/test.yaml => cephfs-shell.yaml} | 0 qa/suites/fs/basic_functional/tasks/cephfs-shell/+ | 0 qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa | 1 - qa/suites/fs/basic_functional/tasks/cephfs-shell/py-3.yaml | 2 -- qa/tasks/cephfs/test_cephfs_shell.py | 6 ------ 5 files changed, 9 deletions(-) rename qa/suites/fs/basic_functional/tasks/{cephfs-shell/test.yaml => cephfs-shell.yaml} (100%) delete mode 100644 qa/suites/fs/basic_functional/tasks/cephfs-shell/+ delete mode 120000 qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa delete mode 100644 qa/suites/fs/basic_functional/tasks/cephfs-shell/py-3.yaml diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/test.yaml b/qa/suites/fs/basic_functional/tasks/cephfs-shell.yaml similarity index 100% rename from qa/suites/fs/basic_functional/tasks/cephfs-shell/test.yaml rename to qa/suites/fs/basic_functional/tasks/cephfs-shell.yaml diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/+ b/qa/suites/fs/basic_functional/tasks/cephfs-shell/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa b/qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa deleted file mode 120000 index fea2489fdf6d9..0000000000000 --- a/qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/py-3.yaml b/qa/suites/fs/basic_functional/tasks/cephfs-shell/py-3.yaml deleted file mode 100644 index 9bd4a922626c3..0000000000000 --- a/qa/suites/fs/basic_functional/tasks/cephfs-shell/py-3.yaml +++ /dev/null @@ -1,2 +0,0 @@ -overrides: - python: python3 diff --git a/qa/tasks/cephfs/test_cephfs_shell.py b/qa/tasks/cephfs/test_cephfs_shell.py index 43f8cf822c385..31f16b44a2570 100644 --- a/qa/tasks/cephfs/test_cephfs_shell.py +++ b/qa/tasks/cephfs/test_cephfs_shell.py @@ -11,12 +11,6 @@ log = logging.getLogger(__name__) class TestCephFSShell(CephFSTestCase): CLIENTS_REQUIRED = 1 - 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: {}".format(self.py_version)) def _cephfs_shell(self, cmd, opts=None, stdin=None): args = ["cephfs-shell", "-c", self.mount_a.config_path] -- 2.39.5