summaryrefslogtreecommitdiffstats
path: root/tests/functional/bvt
diff options
context:
space:
mode:
authorNigel Babu <nigelb@redhat.com>2018-03-05 15:49:23 +0530
committerNigel Babu <nigelb@redhat.com>2018-03-27 16:05:15 +0530
commitfb5145be2db1a7c96b008af8a40e3b7b18df9673 (patch)
tree3ca087e0996bfd975e97b4f0235421a37d2e4767 /tests/functional/bvt
parent8804c9499e9ed0d37823dc55d03eb7792907cf0b (diff)
Fix up coding style issues in tests
Change-Id: I14609030983d4485dbce5a4ffed1e0353e3d1bc7
Diffstat (limited to 'tests/functional/bvt')
-rw-r--r--tests/functional/bvt/__init__.py0
-rw-r--r--tests/functional/bvt/test_basic.py4
-rw-r--r--tests/functional/bvt/test_cvt.py35
-rw-r--r--tests/functional/bvt/test_vvt.py6
4 files changed, 22 insertions, 23 deletions
diff --git a/tests/functional/bvt/__init__.py b/tests/functional/bvt/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/functional/bvt/__init__.py
diff --git a/tests/functional/bvt/test_basic.py b/tests/functional/bvt/test_basic.py
index 54078ef..4dbb23c 100644
--- a/tests/functional/bvt/test_basic.py
+++ b/tests/functional/bvt/test_basic.py
@@ -16,8 +16,8 @@
""" Description: BVT-Basic Tests """
-import pytest
import time
+import pytest
from glusto.core import Glusto as g
from glustolibs.gluster.gluster_base_class import GlusterBaseClass
from glustolibs.gluster.exceptions import ExecutionError
@@ -112,7 +112,7 @@ class TestGlusterdSanity(GlusterBaseClass):
ret = restart_glusterd(self.servers)
if not ret:
raise ExecutionError("Failed to restart glusterd on all "
- "servers %s", self.servers)
+ "servers %s" % self.servers)
g.log.info("Successfully restarted glusterd on all servers %s",
self.servers)
diff --git a/tests/functional/bvt/test_cvt.py b/tests/functional/bvt/test_cvt.py
index 81f692c..dac0fe8 100644
--- a/tests/functional/bvt/test_cvt.py
+++ b/tests/functional/bvt/test_cvt.py
@@ -82,25 +82,24 @@ class GlusterBasicFeaturesSanityBaseClass(GlusterBaseClass):
"file_dir_ops.py")
ret = upload_scripts(cls.clients, script_local_path)
if not ret:
- raise ExecutionError("Failed to upload IO scripts to clients %s",
+ raise ExecutionError("Failed to upload IO scripts to clients %s" %
cls.clients)
g.log.info("Successfully uploaded IO scripts to clients %s",
cls.clients)
cls.counter = 1
- """int: Value of counter is used for dirname-start-num argument for
- file_dir_ops.py create_deep_dirs_with_files.
-
- The --dir-length argument value for
- file_dir_ops.py create_deep_dirs_with_files is set to 10
- (refer to the cmd in setUp method). This means every mount will create
- 10 top level dirs. For every mountpoint/testcase to create new set of
- dirs, we are incrementing the counter by --dir-length value i.e 10
- in this test suite.
-
- If we are changing the --dir-length to new value, ensure the counter
- is also incremented by same value to create new set of files/dirs.
- """
+ # int: Value of counter is used for dirname-start-num argument for
+ # file_dir_ops.py create_deep_dirs_with_files.
+
+ # The --dir-length argument value for file_dir_ops.py
+ # create_deep_dirs_with_files is set to 10 (refer to the cmd in setUp
+ # method). This means every mount will create
+ # 10 top level dirs. For every mountpoint/testcase to create new set of
+ # dirs, we are incrementing the counter by --dir-length value i.e 10 in
+ # this test suite.
+
+ # If we are changing the --dir-length to new value, ensure the counter
+ # is also incremented by same value to create new set of files/dirs.
def setUp(self):
"""
@@ -692,23 +691,23 @@ class TestGlusterHealSanity(GlusterBasicFeaturesSanityBaseClass):
- wait for heal to complete
- validate IO
"""
+ # pylint: disable=too-many-statements
# Check if volume type is dispersed. If the volume type is
# dispersed, set the volume option 'disperse.optimistic-change-log'
# to 'off'
# Refer to: https://bugzilla.redhat.com/show_bug.cgi?id=1470938
+ # pylint: disable=unsupported-membership-test
if 'dispersed' in self.volume_type and 'nfs' in self.mount_type:
g.log.info("Set volume option 'disperse.optimistic-change-log' "
"to 'off' on a dispersed volume . "
"Refer to bug: "
"https://bugzilla.redhat.com/show_bug.cgi?id=1470938")
ret = set_volume_options(self.mnode, self.volname,
- {'disperse.optimistic-change-log': 'off'}
- )
+ {'disperse.optimistic-change-log': 'off'})
self.assertTrue(ret, ("Failed to set the volume option %s to "
"off on volume %s",
'disperse.optimistic-change-log',
- self.volname)
- )
+ self.volname))
g.log.info("Successfully set the volume option "
"'disperse.optimistic-change-log' to 'off'")
diff --git a/tests/functional/bvt/test_vvt.py b/tests/functional/bvt/test_vvt.py
index 1cff675..8b3b69b 100644
--- a/tests/functional/bvt/test_vvt.py
+++ b/tests/functional/bvt/test_vvt.py
@@ -57,7 +57,7 @@ class VolumeAccessibilityTests(GlusterBaseClass):
"file_dir_ops.py")
ret = upload_scripts(cls.clients, script_local_path)
if not ret:
- raise ExecutionError("Failed to upload IO scripts to clients %s",
+ raise ExecutionError("Failed to upload IO scripts to clients %s" %
cls.clients)
g.log.info("Successfully uploaded IO scripts to clients %s",
cls.clients)
@@ -72,7 +72,7 @@ class VolumeAccessibilityTests(GlusterBaseClass):
g.log.info("Starting to Setup Volume %s", self.volname)
ret = self.setup_volume()
if not ret:
- raise ExecutionError("Failed to Setup Volume %s", self.volname)
+ raise ExecutionError("Failed to Setup Volume %s" % self.volname)
g.log.info("Successful in Setup Volume %s", self.volname)
def tearDown(self):
@@ -82,7 +82,7 @@ class VolumeAccessibilityTests(GlusterBaseClass):
g.log.info("Starting to Setup Volume %s", self.volname)
ret = self.cleanup_volume()
if not ret:
- raise ExecutionError("Failed to Setup_Volume %s", self.volname)
+ raise ExecutionError("Failed to Setup_Volume %s" % self.volname)
g.log.info("Successful in Setup Volume %s", self.volname)
# Calling GlusterBaseClass tearDown