diff options
author | Valerii Ponomarov <vponomar@redhat.com> | 2019-12-12 22:10:49 +0530 |
---|---|---|
committer | Bala Konda Reddy M <bmekala@redhat.com> | 2019-12-17 08:28:18 +0000 |
commit | 099438eec88274839411f51cd214f6ff7fdac87c (patch) | |
tree | eb9b0bb0967582e658a25f6f7d751ecacb3a0f9a /tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py | |
parent | e167fe2bd8d556ea79dc1cca424c0910f123ffdf (diff) |
[py2to3] Add py3 support in 'tests/functional/arbiter'
Change-Id: I5a60646b984557ed024cb4b3a8088ce7dfb7622c
Signed-off-by: Valerii Ponomarov <kiparis.kh@gmail.com>
Diffstat (limited to 'tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py')
-rw-r--r-- | tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py b/tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py index 6768d7660..31d019d27 100644 --- a/tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py +++ b/tests/functional/arbiter/test_remove_faulty_subvol_and_add_new_subvol.py @@ -14,7 +14,10 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +import sys + from glusto.core import Glusto as g + from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) from glustolibs.gluster.exceptions import ExecutionError from glustolibs.gluster.volume_libs import (expand_volume, shrink_volume, @@ -41,7 +44,7 @@ class TestArbiterSelfHeal(GlusterBaseClass): @classmethod def setUpClass(cls): # Calling GlusterBaseClass setUpClass - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Upload io scripts for running IO on mounts g.log.info("Upload io scripts to clients %s for running IO on mounts", @@ -59,7 +62,7 @@ class TestArbiterSelfHeal(GlusterBaseClass): def setUp(self): # Calling GlusterBaseClass setUp - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() # Setup Volumes if self.volume_type == "distributed-replicated": @@ -113,7 +116,7 @@ class TestArbiterSelfHeal(GlusterBaseClass): g.log.info("Successful in umounting the volume and Cleanup") # Calling GlusterBaseClass teardown - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() def test_remove_faulty_subvol_and_add_new_subvol(self): """ @@ -132,13 +135,14 @@ class TestArbiterSelfHeal(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create dirs with file g.log.info('Creating dirs with file...') - command = ("python %s create_deep_dirs_with_files " + command = ("/usr/bin/env python%d %s create_deep_dirs_with_files " "-d 2 " "-l 2 " "-n 2 " "-f 20 " - "%s" - % (self.script_upload_path, mount_obj.mountpoint)) + "%s" % ( + sys.version_info.major, self.script_upload_path, + mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, command, user=mount_obj.user) |