From: Rishabh Dave <ridave@redhat.com>
Date: Tue, 13 Feb 2024 16:33:19 +0000 (+0530)
Subject: qa/cephfs: minor adjustment in test_admin.TestFsAuthorize
X-Git-Tag: testing/wip-rishabh-testing-20240909.165402-squid^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5147d3e85b13ae094cbbb080a083380f4a28549b;p=ceph-ci.git

qa/cephfs: minor adjustment in test_admin.TestFsAuthorize

Move related methods ("_remount_and_run_tests()" and "_remount()")
closer to each other and move "tearDown()" to the bottom.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit f33cc3303454a5688a2a568caa4067ba4a8dc847)
---

diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py
index eca7dbf0d0f..a22fbb746e0 100644
--- a/qa/tasks/cephfs/test_admin.py
+++ b/qa/tasks/cephfs/test_admin.py
@@ -1873,12 +1873,6 @@ class TestFsAuthorize(CephFSTestCase):
             self.captesters[i].run_cap_tests(self.fs, self.client_id, PERM,
                                              PATH)
 
-    def tearDown(self):
-        self.mount_a.umount_wait()
-        self.run_ceph_cmd(f'auth rm {self.client_name}')
-
-        super(type(self), self).tearDown()
-
     def _remount(self, keyring, path='/'):
         keyring_path = self.mount_a.client_remote.mktemp(data=keyring)
         self.mount_a.remount(client_id=self.client_id,
@@ -1897,6 +1891,12 @@ class TestFsAuthorize(CephFSTestCase):
 
         captester.run_cap_tests(self.fs, self.client_id, PERM, PATH)
 
+    def tearDown(self):
+        self.mount_a.umount_wait()
+        self.run_ceph_cmd(f'auth rm {self.client_name}')
+
+        super(type(self), self).tearDown()
+
 
 class TestFsAuthorizeUpdate(CephFSTestCase):
     client_id = 'testuser'