summaryrefslogtreecommitdiffstats
path: root/tests/functional/glusterd/test_brick_log_messages.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/functional/glusterd/test_brick_log_messages.py')
-rw-r--r--tests/functional/glusterd/test_brick_log_messages.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/functional/glusterd/test_brick_log_messages.py b/tests/functional/glusterd/test_brick_log_messages.py
index d1f8f2fb5..3469151c0 100644
--- a/tests/functional/glusterd/test_brick_log_messages.py
+++ b/tests/functional/glusterd/test_brick_log_messages.py
@@ -19,8 +19,10 @@
from mountpoint
"""
+import sys
from glusto.core import Glusto as g
+
from glustolibs.gluster.exceptions import ExecutionError
from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on
from glustolibs.gluster.brick_libs import get_all_bricks
@@ -35,7 +37,7 @@ class TestAddBrickFunctionality(GlusterBaseClass):
@classmethod
def setUpClass(cls):
cls.counter = 1
- GlusterBaseClass.setUpClass.im_func(cls)
+ cls.get_super_method(cls, 'setUpClass')()
# Uploading file_dir script in all client direcotries
g.log.info("Upload io scripts to clients %s for running IO on "
@@ -56,7 +58,7 @@ class TestAddBrickFunctionality(GlusterBaseClass):
setUp method for every test
"""
# calling GlusterBaseClass setUp
- GlusterBaseClass.setUp.im_func(self)
+ self.get_super_method(self, 'setUp')()
# Creating Volume
ret = self.setup_volume_and_mount_volume(self.mounts)
@@ -78,7 +80,7 @@ class TestAddBrickFunctionality(GlusterBaseClass):
g.log.info("Volume deleted successfully : %s", self.volname)
# Calling GlusterBaseClass tearDown
- GlusterBaseClass.tearDown.im_func(self)
+ self.get_super_method(self, 'tearDown')()
def test_brick_log_messages(self):
'''
@@ -103,12 +105,13 @@ class TestAddBrickFunctionality(GlusterBaseClass):
for mount_obj in self.mounts:
g.log.info("Starting IO on %s:%s", mount_obj.client_system,
mount_obj.mountpoint)
- cmd = ("python %s create_deep_dirs_with_files "
+ cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
"--dirname-start-num %d "
"--dir-depth 2 "
"--dir-length 5 "
"--max-num-of-dirs 3 "
- "--num-of-files 10 %s" % (self.script_upload_path,
+ "--num-of-files 10 %s" % (sys.version_info.major,
+ self.script_upload_path,
self.counter,
mount_obj.mountpoint))