[TestFix][DHT] Moving test steps from teardown class to teardown

Move cases from teardown class to teardown in dht

Change-Id: Id0cf120c6229715521ae19fd4bb00cad553d701f
Signed-off-by: Sri Vignesh <sselvan@redhat.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/tests/functional/dht/test_access_file.py b/tests/functional/dht/test_access_file.py
index ac8074a81..bb56e40b7 100644
--- a/tests/functional/dht/test_access_file.py
+++ b/tests/functional/dht/test_access_file.py
@@ -52,6 +52,18 @@ class TestFileAccessSubvolDown(GlusterBaseClass):
             g.log.error("Failed to Setup and Mount Volume")
             raise ExecutionError("Failed to Setup and Mount Volume")
 
+    def tearDown(self):
+
+        # Unmount and cleanup original volume
+        g.log.info("Starting to Unmount Volume and Cleanup Volume")
+        ret = self.unmount_volume_and_cleanup_volume(mounts=self.mounts)
+        if not ret:
+            raise ExecutionError("Failed to umount the vol & cleanup Volume")
+        g.log.info("Successful in umounting the volume and Cleanup")
+
+        # Calling GlusterBaseClass tearDown
+        self.get_super_method(self, 'tearDown')()
+
     def test_file_access(self):
         """
         Test file access.
@@ -158,15 +170,3 @@ class TestFileAccessSubvolDown(GlusterBaseClass):
         ret, _, _ = g.run(self.clients[0], ("stat %s" % dstfile))
         self.assertEqual(ret, 1, ('stat error on for file %s', dstfile))
         g.log.info("dstfile access failed as expected")
-
-    @classmethod
-    def tearDownClass(cls):
-        # Unmount Volume and Cleanup Volume
-        g.log.info("Starting to Unmount Volume and Cleanup Volume")
-        ret = cls.unmount_volume_and_cleanup_volume(mounts=cls.mounts)
-        if not ret:
-            raise ExecutionError("Failed to Unmount Volume and Cleanup Volume")
-        g.log.info("Successful in Unmount Volume and Cleanup Volume")
-
-        # Calling GlusterBaseClass tearDown
-        cls.get_super_method(cls, 'tearDownClass')()