qa/tasks/cephfs: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/qa/tasks/cephfs/test_cephfs_shell.py b/qa/tasks/cephfs/test_cephfs_shell.py
index 7880e47376bff11e0c6f171e64aefab4adb4dc9e..37b36a91dbd1e94cb5eca02d497a29172084ecf7 100644 (file)
--- a/qa/tasks/cephfs/test_cephfs_shell.py
+++ b/qa/tasks/cephfs/test_cephfs_shell.py
@@ -8,7 +8,6 @@ import crypt
 import logging
 from tempfile import mkstemp as tempfile_mkstemp
 import math
-from six import ensure_str
 from time import sleep
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 from teuthology.misc import sudo_write_file
@@ -26,6 +25,13 @@ def humansize(nbytes):
     f = ('%d' % nbytes).rstrip('.')
     return '%s%s' % (f, suffixes[i])
 
+def ensure_str(s):
+    if isinstance(s, str):
+        return s
+    if isinstance(s, bytes):
+        return s.decode()
+    raise TypeError("not expecting type '%s'" % type(s))
+    
 class TestCephFSShell(CephFSTestCase):
     CLIENTS_REQUIRED = 1
 

diff --git a/qa/tasks/cephfs/test_failover.py b/qa/tasks/cephfs/test_failover.py
index b14ff70188d2012641b3731b21e3d261e17692fd..1bb1bf2046cd8091bf637ca0811d15dd2b45acf9 100644 (file)
--- a/qa/tasks/cephfs/test_failover.py
+++ b/qa/tasks/cephfs/test_failover.py
@@ -3,7 +3,6 @@ import signal
 import logging
 import operator
 from random import randint
-from six.moves import range
 
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 from teuthology.exceptions import CommandFailedError