diff options
Diffstat (limited to 'tests/functional/nfs_ganesha/test_cthon.py')
| -rw-r--r-- | tests/functional/nfs_ganesha/test_cthon.py | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/tests/functional/nfs_ganesha/test_cthon.py b/tests/functional/nfs_ganesha/test_cthon.py index 5c1c5869d..78232fdac 100644 --- a/tests/functional/nfs_ganesha/test_cthon.py +++ b/tests/functional/nfs_ganesha/test_cthon.py @@ -20,8 +20,7 @@ """ from glusto.core import Glusto as g -from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on -from glustolibs.gluster.nfs_ganesha_libs import NfsGaneshaClusterSetupClass +from glustolibs.gluster.gluster_base_class import runs_on, GlusterBaseClass from glustolibs.gluster.exceptions import ExecutionError from glustolibs.io.utils import run_cthon from glustolibs.misc.misc_libs import git_clone_and_compile @@ -30,7 +29,7 @@ from glustolibs.misc.misc_libs import git_clone_and_compile @runs_on([['replicated', 'distributed', 'distributed-replicated', 'dispersed', 'distributed-dispersed'], ['nfs']]) -class TestCthon(NfsGaneshaClusterSetupClass): +class TestCthon(GlusterBaseClass): """ Cthon test on NFS Ganesha v4.0, v4.1 """ @@ -40,13 +39,7 @@ class TestCthon(NfsGaneshaClusterSetupClass): """ Setup nfs-ganesha if not exists. """ - NfsGaneshaClusterSetupClass.setUpClass.im_func(cls) - - # Setup nfs-ganesha if not exists. - ret = cls.setup_nfs_ganesha() - if not ret: - raise ExecutionError("Failed to setup nfs-ganesha cluster") - g.log.info("nfs-ganesha cluster is healthy") + cls.get_super_method(cls, 'setUpClass')() # Cloning the cthon test repo cls.dir_name = "repo_dir" @@ -65,7 +58,7 @@ class TestCthon(NfsGaneshaClusterSetupClass): """ Setup volume """ - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() g.log.info("Starting to setup volume %s", self.volname) ret = self.setup_volume(volume_create_force=True) @@ -90,7 +83,7 @@ class TestCthon(NfsGaneshaClusterSetupClass): """ Cleanup volume """ - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() # Cleanup volume ret = self.cleanup_volume() @@ -115,7 +108,3 @@ class TestCthon(NfsGaneshaClusterSetupClass): "Check log errors for more info") else: g.log.info("Test repo cleanup successfull on all clients") - - @classmethod - def tearDownClass(cls): - NfsGaneshaClusterSetupClass.tearDownClass.im_func(cls) |