qa: make teardown behavior consistent for kclient/fuse mounts

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index 9881f8599d47559e56b01f21c4ab0e96f37c2592..69b8651a8504f0e91c461465aabf3004db5584bd 100644 (file)
--- a/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@ -418,8 +418,6 @@ class FuseMount(CephFSMount):
         """
         super(FuseMount, self).teardown()
 
-        self.umount()
-
         if self.fuse_daemon and not self.fuse_daemon.finished:
             self.fuse_daemon.stdin.close()
             try:

diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py
index c59f661a3cff4842aae20059b8bf62a9630bddaa..a919918644e229b35397c6542d6a58c44c2c688c 100644 (file)
--- a/qa/tasks/cephfs/kernel_mount.py
+++ b/qa/tasks/cephfs/kernel_mount.py
@@ -204,11 +204,6 @@ class KernelMount(CephFSMount):
         """
         assert self.is_mounted()
 
-    def teardown(self):
-        super(KernelMount, self).teardown()
-        if self.is_mounted():
-            self.umount()
-
     def _get_debug_dir(self):
         """
         Get the debugfs folder for this mount

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index ba4874cc92dacd03a0555f6edabe19d39b71b34d..3ec54058f5689e142fd56941de702422fdbf7ae2 100644 (file)
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -1383,6 +1383,9 @@ class CephFSMount(object):
         log.info("Terminating background process")
         self.kill_background()
 
+        if self.is_mounted():
+            self.umount()
+
     def _kill_background(self, p):
         if p.stdin:
             p.stdin.close()