diff options
Diffstat (limited to 'tests/functional/arbiter/test_no_data_loss_arbiter_vol_after_rename_file.py')
| -rwxr-xr-x | tests/functional/arbiter/test_no_data_loss_arbiter_vol_after_rename_file.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/functional/arbiter/test_no_data_loss_arbiter_vol_after_rename_file.py b/tests/functional/arbiter/test_no_data_loss_arbiter_vol_after_rename_file.py index 8b2b0ff1e..fe52b0d3f 100755 --- a/tests/functional/arbiter/test_no_data_loss_arbiter_vol_after_rename_file.py +++ b/tests/functional/arbiter/test_no_data_loss_arbiter_vol_after_rename_file.py @@ -14,8 +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, @@ -39,7 +41,7 @@ class ArbiterSelfHealTests(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", @@ -61,7 +63,7 @@ class ArbiterSelfHealTests(GlusterBaseClass): """ # calling GlusterBaseClass setUp - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() # Setup Volume and Mount Volume g.log.info("Starting to Setup Volume %s", self.volname) @@ -86,7 +88,7 @@ class ArbiterSelfHealTests(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_no_data_loss_arbiter_vol_after_rename_file(self): """ @@ -131,10 +133,10 @@ class ArbiterSelfHealTests(GlusterBaseClass): self.mounts[0].client_system, self.mounts[0].mountpoint) # Create dir g.log.info('Creating dir...') - command = ('python %s create_deep_dir -d 1 -l 0 -n 1 %s/%s' - % (self.script_upload_path, - self.mounts[0].mountpoint, - test_dir)) + command = ('/usr/bin/env python%d %s create_deep_dir -d 1 -l 0 -n 1 ' + '%s/%s' % ( + sys.version_info.major, self.script_upload_path, + self.mounts[0].mountpoint, test_dir)) ret, _, err = g.run(self.mounts[0].client_system, command, user=self.mounts[0].user) @@ -166,10 +168,9 @@ class ArbiterSelfHealTests(GlusterBaseClass): self.mounts[0].client_system, self.mounts[0].mountpoint) # Create file g.log.info('Creating file...') - command = ("python %s create_files -f 1 %s/%s" - % (self.script_upload_path, - self.mounts[0].mountpoint, - test_dir)) + command = "/usr/bin/env python%d %s create_files -f 1 %s/%s" % ( + sys.version_info.major, self.script_upload_path, + self.mounts[0].mountpoint, test_dir) ret, _, err = g.run(self.mounts[0].client_system, command, user=self.mounts[0].user) @@ -215,10 +216,9 @@ class ArbiterSelfHealTests(GlusterBaseClass): # Rename file under test_dir g.log.info("Renaming file for %s:%s", self.mounts[0].client_system, self.mounts[0].mountpoint) - command = ("python %s mv %s/%s" - % (self.script_upload_path, - self.mounts[0].mountpoint, - test_dir)) + command = "/usr/bin/env python%d %s mv %s/%s" % ( + sys.version_info.major, self.script_upload_path, + self.mounts[0].mountpoint, test_dir) ret, _, err = g.run(self.mounts[0].client_system, command) self.assertEqual(ret, 0, err) g.log.info("Renaming file for %s:%s is successful", |