From: Rishabh Dave <ridave@redhat.com>
Date: Sat, 30 Apr 2022 07:26:49 +0000 (+0530)
Subject: qa/vstart_runner: fix bug in LocalFuseMount._run_mount_cmd()
X-Git-Tag: v18.0.0~935^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=94d2b1048ff9e979ae960e7d568b0a264f6816d4;p=ceph.git

qa/vstart_runner: fix bug in LocalFuseMount._run_mount_cmd()

This methods fails to collect return value from
FuseMount._run_mount_cmd() and return it. This leads to a bug for tests
that expect mount command to fail when executed with vstart_runner.py.

Fixes: https://tracker.ceph.com/issues/55553
Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 7fa426acdf459..a2eac75582dbc 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -743,8 +743,10 @@ class LocalFuseMount(LocalCephFSMount, FuseMount):
         self.client_remote.run(args=f'mkdir -p -v {self.hostfs_mntpt}')
 
     def _run_mount_cmd(self, mntopts, check_status):
-        super(type(self), self)._run_mount_cmd(mntopts, check_status)
-        self._set_fuse_daemon_pid(check_status)
+        retval = super(type(self), self)._run_mount_cmd(mntopts, check_status)
+        if retval is None: # None represents success
+            self._set_fuse_daemon_pid(check_status)
+        return retval
 
     def _get_mount_cmd(self, mntopts):
         mount_cmd = super(type(self), self)._get_mount_cmd(mntopts)