summaryrefslogtreecommitdiffstats
path: root/tests/functional/glusterd/test_volume_status.py
diff options
context:
space:
mode:
authorValerii Ponomarov <vponomar@redhat.com>2019-12-13 21:19:07 +0530
committerBala Konda Reddy M <bmekala@redhat.com>2019-12-18 10:55:39 +0000
commit6a17654e9be3d5fbae9fa25249a7e2c8d892df3a (patch)
tree8812776ebfbb0ec17cbc481fd8a3b2c62aecc644 /tests/functional/glusterd/test_volume_status.py
parent902dc78766d0938f0e40c71c25a4ce2bb10b005d (diff)
[py2to3] Add py3 support in 'tests/functional/glusterd'. Part 2
Change-Id: I1395e14d8d0aa0cc6097e51c64262fb481f36f05 Signed-off-by: Valerii Ponomarov <kiparis.kh@gmail.com>
Diffstat (limited to 'tests/functional/glusterd/test_volume_status.py')
-rw-r--r--tests/functional/glusterd/test_volume_status.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/functional/glusterd/test_volume_status.py b/tests/functional/glusterd/test_volume_status.py
index 109586f35..ef40ec219 100644
--- a/tests/functional/glusterd/test_volume_status.py
+++ b/tests/functional/glusterd/test_volume_status.py
@@ -19,8 +19,11 @@ Test Cases in this module related to Glusterd volume status while
IOs in progress
"""
import random
+import sys
from time import sleep
+
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.misc.misc_libs import upload_scripts
@@ -34,7 +37,7 @@ class VolumeStatusWhenIOInProgress(GlusterBaseClass):
@classmethod
def setUpClass(cls):
cls.counter = 1
- GlusterBaseClass.setUpClass.im_func(cls)
+ cls.get_super_method(cls, 'setUpClass')()
# checking for peer status from every node
ret = cls.validate_peers_are_connected()
@@ -63,7 +66,7 @@ class VolumeStatusWhenIOInProgress(GlusterBaseClass):
setUp method for every test
"""
# calling GlusterBaseClass setUp
- GlusterBaseClass.setUp.im_func(self)
+ self.get_super_method(self, 'setUp')()
# Creating Volume
g.log.info("Started creating volume")
@@ -100,7 +103,7 @@ class VolumeStatusWhenIOInProgress(GlusterBaseClass):
raise ExecutionError("Failed Cleanup the Volume %s" % self.volname)
# Calling GlusterBaseClass tearDown
- GlusterBaseClass.tearDown.im_func(self)
+ self.get_super_method(self, 'tearDown')()
def test_volume_status_inode_while_io_in_progress(self):
'''
@@ -129,12 +132,13 @@ class VolumeStatusWhenIOInProgress(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 15 "
"--max-num-of-dirs 5 "
- "--num-of-files 25 %s" % (self.script_upload_path,
+ "--num-of-files 25 %s" % (sys.version_info.major,
+ self.script_upload_path,
self.counter,
mount_obj.mountpoint))