diff options
Diffstat (limited to 'tests/functional/bvt/test_basic.py')
-rw-r--r-- | tests/functional/bvt/test_basic.py | 92 |
1 files changed, 48 insertions, 44 deletions
diff --git a/tests/functional/bvt/test_basic.py b/tests/functional/bvt/test_basic.py index 336443940..54078ef44 100644 --- a/tests/functional/bvt/test_basic.py +++ b/tests/functional/bvt/test_basic.py @@ -20,33 +20,22 @@ import pytest import time from glusto.core import Glusto as g from glustolibs.gluster.gluster_base_class import GlusterBaseClass +from glustolibs.gluster.exceptions import ExecutionError from glustolibs.gluster.gluster_init import ( is_glusterd_running, restart_glusterd, start_glusterd, stop_glusterd) -from glustolibs.gluster.peer_ops import is_peer_connected, peer_status class TestGlusterdSanity(GlusterBaseClass): """GLusterd Sanity check """ - def are_peers_in_connected_state(self): - """Validate if all the peers are in connected state from all servers. - """ - _rc = True - # Validate if peer is connected from all the servers - for server in self.servers: - ret = is_peer_connected(server, self.servers) - if not ret: - _rc = False - - # Peer Status from mnode - peer_status(self.mnode) - - return _rc - def setUp(self): """setUp required for tests """ + # Calling GlusterBaseClass setUp GlusterBaseClass.setUp.im_func(self) + + # Defining this variable to check if restart glusterd is required + # in teardown self.test_method_complete = False @pytest.mark.bvt_basic @@ -55,51 +44,60 @@ class TestGlusterdSanity(GlusterBaseClass): peers are in connected state after glusterd restarts. """ # restart glusterd on all servers - g.log.info("Restart glusterd on all servers") + g.log.info("Restart glusterd on all servers %s", self.servers) ret = restart_glusterd(self.servers) - self.assertTrue(ret, "Failed to restart glusterd on all servers") - g.log.info("Successfully restarted glusterd on all servers") + self.assertTrue(ret, ("Failed to restart glusterd on all servers %s", + self.servers)) + g.log.info("Successfully restarted glusterd on all servers %s", + self.servers) # Check if glusterd is running on all servers(expected: active) - g.log.info("Check if glusterd is running on all servers" - "(expected: active)") + g.log.info("Check if glusterd is running on all servers %s" + "(expected: active)", self.servers) ret = is_glusterd_running(self.servers) - self.assertEqual(ret, 0, "Glusterd is not running on all servers") - g.log.info("Glusterd is running on all the servers") + self.assertEqual(ret, 0, ("Glusterd is not running on all servers %s", + self.servers)) + g.log.info("Glusterd is running on all the servers %s", self.servers) # Stop glusterd on all servers - g.log.info("Stop glusterd on all servers") + g.log.info("Stop glusterd on all servers %s", self.servers) ret = stop_glusterd(self.servers) - self.assertTrue(ret, "Failed to stop glusterd on all servers") - g.log.info("Successfully stopped glusterd on all servers") + self.assertTrue(ret, ("Failed to stop glusterd on all servers %s", + self.servers)) + g.log.info("Successfully stopped glusterd on all servers %s", + self.servers) # Check if glusterd is running on all servers(expected: not running) - g.log.info("Check if glusterd is running on all servers" - "(expected: not running)") + g.log.info("Check if glusterd is running on all servers %s" + "(expected: not running)", self.servers) ret = is_glusterd_running(self.servers) - self.assertNotEqual(ret, 0, "Glusterd is still running on some " - "servers") - g.log.info("Glusterd not running on any servers as expected.") + self.assertNotEqual(ret, 0, ("Glusterd is still running on some " + "servers %s", self.servers)) + g.log.info("Glusterd not running on any servers %s as expected.", + self.servers) # Start glusterd on all servers - g.log.info("Start glusterd on all servers") + g.log.info("Start glusterd on all servers %s", self.servers) ret = start_glusterd(self.servers) - self.assertTrue(ret, "Failed to start glusterd on all servers") - g.log.info("Successfully started glusterd on all servers") + self.assertTrue(ret, ("Failed to start glusterd on all servers %s", + self.servers)) + g.log.info("Successfully started glusterd on all servers %s", + self.servers) # Check if glusterd is running on all servers(expected: active) - g.log.info("Check if glusterd is running on all servers" - "(expected: active)") + g.log.info("Check if glusterd is running on all servers %s" + "(expected: active)", self.servers) ret = is_glusterd_running(self.servers) - self.assertEqual(ret, 0, "Glusterd is not running on all servers") - g.log.info("Glusterd is running on all the servers") + self.assertEqual(ret, 0, ("Glusterd is not running on all servers %s", + self.servers)) + g.log.info("Glusterd is running on all the servers %s", self.servers) # Wait for all the glusterd's to establish communication. time.sleep(30) # Validate all the peers are in connected state g.log.info("Validating all the peers are in Cluster and Connected") - ret = self.are_peers_in_connected_state() + ret = self.validate_peers_are_connected() self.assertTrue(ret, "Validating Peers to be in Cluster Failed") g.log.info("All peers are in connected state") @@ -110,18 +108,24 @@ class TestGlusterdSanity(GlusterBaseClass): """ if not self.test_method_complete: # restart glusterd on all servers - g.log.info("Restart glusterd on all servers") + g.log.info("Restart glusterd on all servers %s", self.servers) ret = restart_glusterd(self.servers) - self.assertTrue(ret, "Failed to restart glusterd on all servers") - g.log.info("Successfully restarted glusterd on all servers") + if not ret: + raise ExecutionError("Failed to restart glusterd on all " + "servers %s", self.servers) + g.log.info("Successfully restarted glusterd on all servers %s", + self.servers) # Wait for all the glusterd's to establish communication. time.sleep(30) # Validate all the peers are in connected state g.log.info("Validating all the peers are in Cluster and Connected") - ret = self.are_peers_in_connected_state() - self.assertTrue(ret, "Validating Peers to be in Cluster Failed") + ret = self.validate_peers_are_connected() + if not ret: + raise ExecutionError("Validating Peers to be in Cluster " + "Failed") g.log.info("All peers are in connected state") + # Calling GlusterBaseClass tearDown GlusterBaseClass.tearDown.im_func(self) |