diff options
| author | Valerii Ponomarov <vponomar@redhat.com> | 2019-12-11 21:06:59 +0530 |
|---|---|---|
| committer | Bala Konda Reddy M <bmekala@redhat.com> | 2019-12-18 10:22:20 +0000 |
| commit | b1dfa315487c2da399988775e5de39354f686b0c (patch) | |
| tree | c5cefcd8749b3af430763e41ea01154608702cc2 /tests/functional/afr/test_conservative_merge_of_files_heal_command.py | |
| parent | e25ca323395f20232ca2e54ea6c966f91ea54e7e (diff) | |
[py2to3] Add py3 support for tests in 'tests/functional/afr'
Change-Id: Ic14be81f1cd42c470d2bb5c15505fc1bc168a393
Signed-off-by: Valerii Ponomarov <kiparis.kh@gmail.com>
Diffstat (limited to 'tests/functional/afr/test_conservative_merge_of_files_heal_command.py')
| -rw-r--r-- | tests/functional/afr/test_conservative_merge_of_files_heal_command.py | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/tests/functional/afr/test_conservative_merge_of_files_heal_command.py b/tests/functional/afr/test_conservative_merge_of_files_heal_command.py index 06514b972..9a703c948 100644 --- a/tests/functional/afr/test_conservative_merge_of_files_heal_command.py +++ b/tests/functional/afr/test_conservative_merge_of_files_heal_command.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_ops import set_volume_options @@ -45,7 +48,7 @@ class VerifySelfHealTriggersHealCommand(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", @@ -71,7 +74,7 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): def setUp(self): # Calling GlusterBaseClass setUp - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() self.all_mounts_procs = [] self.io_validation_complete = False @@ -106,7 +109,7 @@ class VerifySelfHealTriggersHealCommand(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_conservative_merge_of_files_heal_command(self): """ @@ -160,9 +163,10 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create files g.log.info('Creating files...') - command = ("python %s create_deep_dirs_with_files " - "-d 0 -l 5 -f 10 --dirname-start-num 1 %s" - % (self.script_upload_path, mount_obj.mountpoint)) + command = ("/usr/bin/env python%d %s create_deep_dirs_with_files " + "-d 0 -l 5 -f 10 --dirname-start-num 1 %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) @@ -204,9 +208,10 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create files g.log.info('Creating files...') - command = ("python %s create_deep_dirs_with_files " - "-d 0 -l 5 -f 10 --dirname-start-num 6 %s" - % (self.script_upload_path, mount_obj.mountpoint)) + command = ("/usr/bin/env python%d %s create_deep_dirs_with_files " + "-d 0 -l 5 -f 10 --dirname-start-num 6 %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) @@ -320,6 +325,7 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): g.log.info('Arequals for mountpoint and %s are equal', brick) g.log.info('All arequals are equal for replicated') - self.assertNotEqual(cmp(arequals_before_heal, arequals_after_heal), 0, - 'Arequals are equal for bricks ' - 'before and after healing') + self.assertNotEqual( + arequals_before_heal, arequals_after_heal, + 'Arequals are equal for bricks before (%s) and after (%s) ' + 'healing' % (arequals_before_heal, arequals_after_heal)) |