summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkasturiNarra <knarra@redhat.com>2019-12-11 15:08:30 +0530
committervponomar <vponomar@redhat.com>2019-12-12 14:34:29 +0000
commitd832892648b5609f1ff0a34bfd9836946b555d69 (patch)
tree56353caefe9e3c757389f2524298e4c36e5e1785
parent2f47edef2d3cb56137000baca6640aec6696c00e (diff)
Fix test to run when iscsi-intiator-utils package is the expected
Fix test to run when iscsi-intiator-utils package is not less than 6.2.0.874-13.el7 Change-Id: Ic3af5302a415c2d2420ad9b92f2d82246420beea
-rw-r--r--tests/functional/gluster_stability/test_gluster_block_stability.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/functional/gluster_stability/test_gluster_block_stability.py b/tests/functional/gluster_stability/test_gluster_block_stability.py
index 98e8ba3..4977806 100644
--- a/tests/functional/gluster_stability/test_gluster_block_stability.py
+++ b/tests/functional/gluster_stability/test_gluster_block_stability.py
@@ -1,5 +1,4 @@
import re
-from unittest import skip
import ddt
from glusto.core import Glusto as g
@@ -847,13 +846,13 @@ class TestGlusterBlockStability(GlusterBlockBaseClass):
self.heketi_client_node, self.heketi_server_url)
self.assertNotIn(vol_name_prefix, h_vol_list)
- @skip("Blocked by BZ-1624670")
def test_path_failures_on_initiator_node_migration_and_pod_restart(self):
"""Verify path failures on initiator node migration
and app pod restart. Also, make sure that existing
paths get cleaned up and recreated on new nodes.
"""
pvc_size, pvc_amount = 1, 20
+ e_pkg_version = '6.2.0.874-13'
free_space, node_count = get_total_free_space(
self.heketi_client_node, self.heketi_server_url)
if node_count < 3:
@@ -866,6 +865,18 @@ class TestGlusterBlockStability(GlusterBlockBaseClass):
"is less than the space_required %s."
% (free_space_available, space_required))
+ # Skip the test if iscsi-initiator-utils version is not the expected
+ cmd = ("rpm -q iscsi-initiator-utils"
+ " --queryformat '%{version}-%{release}\n'"
+ "| cut -d '.' -f 1,2,3,4")
+ for g_server in self.gluster_servers:
+ out = self.cmd_run(cmd, g_server)
+ if parse_version(out) < parse_version(e_pkg_version):
+ self.skipTest("Skip test since isci initiator utils version "
+ "actual: %s is less than expected: %s "
+ "on node %s, for more info refer to BZ-1624670"
+ % (out, e_pkg_version, g_server))
+
# Create pvs & dc's
pvc_names = self.create_and_wait_for_pvcs(
pvc_size=pvc_size, pvc_amount=pvc_amount,