From: Kefu Chai Date: Sun, 28 Jun 2020 11:10:43 +0000 (+0800) Subject: qa/tasks/cephfs: drop py2 support X-Git-Tag: v16.1.0~1844^2~26 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee90f409058614c2194f7b310859435aecd8a63e;p=ceph.git qa/tasks/cephfs: drop py2 support Signed-off-by: Kefu Chai --- diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py index 70fcaacdef6c..6bcb30f8e5cc 100644 --- a/qa/tasks/cephfs/fuse_mount.py +++ b/qa/tasks/cephfs/fuse_mount.py @@ -2,7 +2,6 @@ from io import StringIO import json import time import logging -import six from textwrap import dedent @@ -217,7 +216,7 @@ class FuseMount(CephFSMount): log.info('mount point does not exist: %s', self.mountpoint) return False - fstype = six.ensure_str(proc.stdout.getvalue()).rstrip('\n') + fstype = proc.stdout.getvalue().rstrip('\n') if fstype == 'fuseblk': log.info('ceph-fuse is mounted on %s', self.mountpoint) return True diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index 104253f2152b..6b258d2f84b4 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -2,9 +2,8 @@ from contextlib import contextmanager import json import logging import datetime -import six import time -from six import StringIO +from io import StringIO from textwrap import dedent import os import re @@ -498,7 +497,7 @@ class CephFSMount(object): def run_python(self, pyscript, py_version='python3'): p = self._run_python(pyscript, py_version) p.wait() - return six.ensure_str(p.stdout.getvalue().strip()) + return p.stdout.getvalue().strip() def run_shell(self, args, wait=True, stdin=None, check_status=True, cwd=None, omit_sudo=True): diff --git a/qa/tasks/cephfs/test_cephfs_shell.py b/qa/tasks/cephfs/test_cephfs_shell.py index f2081c011d7e..7880e47376bf 100644 --- a/qa/tasks/cephfs/test_cephfs_shell.py +++ b/qa/tasks/cephfs/test_cephfs_shell.py @@ -9,8 +9,6 @@ import logging from tempfile import mkstemp as tempfile_mkstemp import math from six import ensure_str -from sys import version_info as sys_version_info -from re import search as re_search from time import sleep from tasks.cephfs.cephfs_test_case import CephFSTestCase from teuthology.misc import sudo_write_file @@ -518,12 +516,7 @@ class TestDU(TestCephFSShell): expected_output = r'{}{}{}'.format(size, " +", regfilename) du_output = self.get_cephfs_shell_cmd_output('du ' + regfilename) - if sys_version_info.major >= 3: - self.assertRegex(du_output, expected_output) - elif sys_version_info.major < 3: - assert re_search(expected_output, du_output) != None, "\n" + \ - "expected_output -\n{}\ndu_output -\n{}\n".format( - expected_output, du_output) + self.assertRegex(du_output, expected_output) def test_du_works_for_non_empty_dirs(self): dirname = 'some_directory' @@ -540,12 +533,7 @@ class TestDU(TestCephFSShell): sleep(10) du_output = self.get_cephfs_shell_cmd_output('du ' + dirname) - if sys_version_info.major >= 3: - self.assertRegex(du_output, expected_output) - elif sys_version_info.major < 3: - assert re_search(expected_output, du_output) != None, "\n" + \ - "expected_output -\n{}\ndu_output -\n{}\n".format( - expected_output, du_output) + self.assertRegex(du_output, expected_output) def test_du_works_for_empty_dirs(self): dirname = 'some_directory' @@ -556,12 +544,7 @@ class TestDU(TestCephFSShell): expected_output = r'{}{}{}'.format(size, " +", dirname) du_output = self.get_cephfs_shell_cmd_output('du ' + dirname) - if sys_version_info.major >= 3: - self.assertRegex(du_output, expected_output) - elif sys_version_info.major < 3: - assert re_search(expected_output, du_output) != None, "\n" + \ - "expected_output -\n{}\ndu_output -\n{}\n".format( - expected_output, du_output) + self.assertRegex(du_output, expected_output) def test_du_works_for_hardlinks(self): regfilename = 'some_regfile' @@ -577,12 +560,7 @@ class TestDU(TestCephFSShell): expected_output = r'{}{}{}'.format(size, " +", hlinkname) du_output = self.get_cephfs_shell_cmd_output('du ' + hlinkname) - if sys_version_info.major >= 3: - self.assertRegex(du_output, expected_output) - elif sys_version_info.major < 3: - assert re_search(expected_output, du_output) != None, "\n" + \ - "expected_output -\n{}\ndu_output -\n{}\n".format( - expected_output, du_output) + self.assertRegex(du_output, expected_output) def test_du_works_for_softlinks_to_files(self): regfilename = 'some_regfile' @@ -596,12 +574,7 @@ class TestDU(TestCephFSShell): expected_output = r'{}{}{}'.format((size), " +", slinkname) du_output = self.get_cephfs_shell_cmd_output('du ' + slinkname) - if sys_version_info.major >= 3: - self.assertRegex(du_output, expected_output) - elif sys_version_info.major < 3: - assert re_search(expected_output, du_output) != None, "\n" + \ - "expected_output -\n{}\ndu_output -\n{}\n".format( - expected_output, du_output) + self.assertRegex(du_output, expected_output) def test_du_works_for_softlinks_to_dirs(self): dirname = 'some_directory' @@ -615,12 +588,7 @@ class TestDU(TestCephFSShell): expected_output = r'{}{}{}'.format(size, " +", slinkname) du_output = self.get_cephfs_shell_cmd_output('du ' + slinkname) - if sys_version_info.major >= 3: - self.assertRegex(du_output, expected_output) - elif sys_version_info.major < 3: - assert re_search(expected_output, du_output) != None, "\n" + \ - "expected_output -\n{}\ndu_output -\n{}\n".format( - expected_output, du_output) + self.assertRegex(du_output, expected_output) # NOTE: tests using these are pretty slow since to this methods sleeps for # 15 seconds @@ -706,12 +674,7 @@ class TestDU(TestCephFSShell): du_output = self.get_cephfs_shell_cmd_output('du -r') for expected_output in expected_patterns_in_output: - if sys_version_info.major >= 3: - self.assertRegex(du_output, expected_output) - elif sys_version_info.major < 3: - assert re_search(expected_output, du_output) != None, "\n" + \ - "expected_output -\n{}\ndu_output -\n{}\n".format( - expected_output, du_output) + self.assertRegex(du_output, expected_output) def test_du_with_path_in_args(self): expected_patterns_in_output, path_to_files = self._setup_files(True, @@ -723,12 +686,7 @@ class TestDU(TestCephFSShell): du_output = self.get_cephfs_shell_cmd_output(args) for expected_output in expected_patterns_in_output: - if sys_version_info.major >= 3: - self.assertRegex(du_output, expected_output) - elif sys_version_info.major < 3: - assert re_search(expected_output, du_output) != None, "\n" +\ - "expected_output -\n{}\ndu_output -\n{}\n".format( - expected_output, du_output) + self.assertRegex(du_output, expected_output) def test_du_with_no_args(self): expected_patterns_in_output = self._setup_files() @@ -739,12 +697,7 @@ class TestDU(TestCephFSShell): # Since CWD is CephFS root and being non-recursive expect only # CWD in DU report. if expected_output.find('/') == len(expected_output) - 1: - if sys_version_info.major >= 3: - self.assertRegex(du_output, expected_output) - elif sys_version_info.major < 3: - assert re_search(expected_output, du_output) != None, "\n" + \ - "expected_output -\n{}\ndu_output -\n{}\n".format( - expected_output, du_output) + self.assertRegex(du_output, expected_output) class TestDF(TestCephFSShell): @@ -956,12 +909,7 @@ class TestMisc(TestCephFSShell): output = self.mount_a.client_remote.sh(['cephfs-shell', 'ls']).\ strip() - if sys_version_info.major >= 3: - self.assertRegex(output, dirname) - elif sys_version_info.major < 3: - assert re_search(dirname, output) != None, "\n" + \ - "expected_output -\n{}\ndu_output -\n{}\n".format( - dirname, output) + self.assertRegex(output, dirname) def test_help(self): """ diff --git a/qa/tasks/cephfs/xfstests_dev.py b/qa/tasks/cephfs/xfstests_dev.py index 1a18b7e14007..849fbba0ba72 100644 --- a/qa/tasks/cephfs/xfstests_dev.py +++ b/qa/tasks/cephfs/xfstests_dev.py @@ -1,5 +1,4 @@ from io import BytesIO -import six import logging from tasks.cephfs.cephfs_test_case import CephFSTestCase @@ -51,16 +50,10 @@ class XFSTestsDev(CephFSTestCase): def get_admin_key(self): import configparser - from sys import version_info as sys_version_info cp = configparser.ConfigParser() - if sys_version_info.major > 2: - cp.read_string(self.fs.mon_manager.raw_cluster_cmd( - 'auth', 'get-or-create', 'client.admin')) - # TODO: remove this part when we stop supporting Python 2 - elif sys_version_info.major <= 2: - cp.read_string(six.text_type(self.fs.mon_manager.raw_cluster_cmd( - 'auth', 'get-or-create', 'client.admin'))) + cp.read_string(self.fs.mon_manager.raw_cluster_cmd( + 'auth', 'get-or-create', 'client.admin')) return cp['client.admin']['key']