From 02f0a3f136f85e472f3657a4af2b94e8af33c46b Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Fri, 6 May 2022 21:36:28 +0530 Subject: [PATCH] qa/cephfs: omit_sudo must be passed to underlying method... so that it can have it's intended effect. Fixes: https://tracker.ceph.com/issues/55572 Signed-off-by: Rishabh Dave --- qa/tasks/cephfs/mount.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index c0855bbc17173..bb27b61d687f5 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -701,7 +701,7 @@ class CephFSMount(object): return p.stdout.getvalue().strip() def run_shell(self, args, timeout=300, **kwargs): - kwargs.pop('omit_sudo', False) + omit_sudo = kwargs.pop('omit_sudo', False) sudo = kwargs.pop('sudo', False) cwd = kwargs.pop('cwd', self.mountpoint) stdout = kwargs.pop('stdout', StringIO()) @@ -715,7 +715,7 @@ class CephFSMount(object): return self.client_remote.run(args=args, cwd=cwd, timeout=timeout, stdout=stdout, stderr=stderr, - omit_sudo=False, **kwargs) + omit_sudo=omit_sudo, **kwargs) def run_shell_payload(self, payload, **kwargs): return self.run_shell(["bash", "-c", Raw(f"'{payload}'")], **kwargs) -- 2.39.5