From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 6 Oct 2020 16:37:21 +0000 (-0700)
Subject: qa: remove redundant rmr
X-Git-Tag: v15.2.8~5^2~1^2~21^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5e8b8f372eb4a5357dbe44504808ca342a427ee;p=ceph.git

qa: remove redundant rmr

The mount.cleanup method will remove the mount point. This `rm -rf` will
always fail (with exit status 0).

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 8e7a89009c41570e9f87f57d92d519b7c49d7706)

Conflicts:
	qa/tasks/cephfs/fuse_mount.py

        Notes: convert to cleanup call.
---

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index 1f5fe1b0b663..4e0a3d553bce 100644
--- a/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@ -368,7 +368,6 @@ class FuseMount(CephFSMount):
                 cwd=self.test_dir,
                 stderr=stderr,
                 timeout=(60*5),
-                check_status=False,
             )
         except CommandFailedError:
             if b"No such file or directory" in stderr.getvalue():
@@ -410,16 +409,7 @@ class FuseMount(CephFSMount):
             except CommandFailedError:
                 pass
 
-        # Indiscriminate, unlike the touchier cleanup()
-        self.client_remote.run(
-            args=[
-                'rm',
-                '-rf',
-                self.mountpoint,
-            ],
-            cwd=self.test_dir,
-            timeout=(60*5)
-        )
+        return self.cleanup()
 
     def _asok_path(self):
         return "/var/run/ceph/ceph-client.{0}.*.asok".format(self.client_id)