summaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorNitin Goyal <nigoyal@redhat.com>2019-07-02 12:23:54 +0530
committerNitin Goyal <nigoyal@redhat.com>2019-07-02 12:47:49 +0000
commit3997c825e0a42256ba5125c0cd378934787ff2dc (patch)
tree32ad5d69dc94c219433912b3cb35f3e2e72ae59e /tests/functional
parent33c9873aca41c262bcc2c31a381279503c1982b9 (diff)
Add state arg in *_service_status_* libs in openshift-ops module
Before, these libraries could be used for 'active' state only. Make it accept one additional 'state' argument for possibility to use it for any state, not just one. Change-Id: I6d4fbd7584b308e3ad248213cb0ec3f4996f6437
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/gluster_stability/test_gluster_services_restart.py8
-rw-r--r--tests/functional/test_node_restart.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/functional/gluster_stability/test_gluster_services_restart.py b/tests/functional/gluster_stability/test_gluster_services_restart.py
index ff00407b..0d5077c3 100644
--- a/tests/functional/gluster_stability/test_gluster_services_restart.py
+++ b/tests/functional/gluster_stability/test_gluster_services_restart.py
@@ -288,9 +288,9 @@ class GlusterStabilityTestSetup(BaseClass):
# checks if all glusterfs services are in running state
for g_node in g_nodes:
for service in (SERVICE_BLOCKD, SERVICE_TCMU, SERVICE_TARGET):
- status = "exited" if service == SERVICE_TARGET else "running"
+ state = "exited" if service == SERVICE_TARGET else "running"
self.assertTrue(wait_for_service_status_on_gluster_pod_or_node(
- self.oc_node, service, status, g_node))
+ self.oc_node, service, 'active', state, g_node))
# validates pvc, pv, heketi block and gluster block count after
# service restarts
@@ -312,9 +312,9 @@ class GlusterStabilityTestSetup(BaseClass):
# checks if all glusterfs services are in running state
for g_node in g_nodes:
for service in (SERVICE_BLOCKD, SERVICE_TCMU, SERVICE_TARGET):
- status = "exited" if service == SERVICE_TARGET else "running"
+ state = "exited" if service == SERVICE_TARGET else "running"
self.assertTrue(wait_for_service_status_on_gluster_pod_or_node(
- self.oc_node, service, status, g_node))
+ self.oc_node, service, 'active', state, g_node))
# validates pvc, pv, heketi block and gluster block count after
# service restarts
diff --git a/tests/functional/test_node_restart.py b/tests/functional/test_node_restart.py
index d1be4232..745ea2db 100644
--- a/tests/functional/test_node_restart.py
+++ b/tests/functional/test_node_restart.py
@@ -134,7 +134,7 @@ class TestNodeRestart(BaseClass):
g.log.info("gluster_pod - '%s' : gluster_service '%s'" % (
gluster_pod, service))
check_service_status_on_pod(
- self.oc_node, gluster_pod, service, "running"
+ self.oc_node, gluster_pod, service, "active", "running"
)
@skip("Blocked by BZ-1652913")