]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/vstart_runner: fix bug in LocalFuseMount._run_mount_cmd() 46169/head
authorRishabh Dave <ridave@redhat.com>
Sat, 30 Apr 2022 07:26:49 +0000 (12:56 +0530)
committerRishabh Dave <ridave@redhat.com>
Thu, 5 May 2022 15:33:46 +0000 (21:03 +0530)
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>
qa/tasks/vstart_runner.py

index 7fa426acdf459d1929cbd615155dedcd36a94578..a2eac75582dbc037483fe8551007a0f48fbb89c6 100644 (file)
@@ -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)