diff options
Diffstat (limited to 'tests/functional/dht/test_restart_glusterd_after_rebalance.py')
| -rw-r--r-- | tests/functional/dht/test_restart_glusterd_after_rebalance.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/functional/dht/test_restart_glusterd_after_rebalance.py b/tests/functional/dht/test_restart_glusterd_after_rebalance.py index 5c278318d..408e309a1 100644 --- a/tests/functional/dht/test_restart_glusterd_after_rebalance.py +++ b/tests/functional/dht/test_restart_glusterd_after_rebalance.py @@ -131,7 +131,8 @@ class RebalanceValidation(GlusterBaseClass): # Wait for rebalance to complete g.log.info("Waiting for rebalance to complete") - ret = wait_for_rebalance_to_complete(self.mnode, self.volname) + ret = wait_for_rebalance_to_complete(self.mnode, self.volname, + timeout=1800) self.assertTrue(ret, ("Rebalance is not yet complete on the volume " "%s", self.volname)) g.log.info("Rebalance is successfully complete on the volume %s", @@ -163,14 +164,14 @@ class RebalanceValidation(GlusterBaseClass): g.log.info("Rebalance is NOT triggered on %s after glusterd " "restart", server) - @classmethod - def tearDownClass(cls): - # Unmount Volume and Cleanup Volume + def tearDown(self): + + # Unmount and cleanup original volume g.log.info("Starting to Unmount Volume and Cleanup Volume") - ret = cls.unmount_volume_and_cleanup_volume(mounts=cls.mounts) + ret = self.unmount_volume_and_cleanup_volume(mounts=self.mounts) if not ret: - raise ExecutionError("Failed to Unmount Volume and Cleanup Volume") - g.log.info("Successful in Unmount Volume and Cleanup Volume") + raise ExecutionError("Failed to umount the vol & cleanup Volume") + g.log.info("Successful in umounting the volume and Cleanup") # Calling GlusterBaseClass tearDown - cls.get_super_method(cls, 'tearDownClass')() + self.get_super_method(self, 'tearDown')() |