From 248cf6b0a7b67da453f60354869d87dc4d0acf20 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 (cherry picked from commit 02f0a3f136f85e472f3657a4af2b94e8af33c46b) Conflicts: qa/tasks/cephfs/mount.py: timeout change wasn't backported --- qa/tasks/cephfs/mount.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index bbc543969c3..a24fd284aaa 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -660,7 +660,7 @@ class CephFSMount(object): def run_shell(self, args, timeout=900, **kwargs): args = args.split() if isinstance(args, str) else args - 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()) @@ -669,7 +669,9 @@ class CephFSMount(object): if sudo: args.insert(0, 'sudo') - return self.client_remote.run(args=args, cwd=cwd, timeout=timeout, stdout=stdout, stderr=stderr, **kwargs) + return self.client_remote.run(args=args, cwd=cwd, timeout=timeout, + stdout=stdout, stderr=stderr, + omit_sudo=omit_sudo, **kwargs) def run_shell_payload(self, payload, **kwargs): return self.run_shell(["bash", "-c", Raw(f"'{payload}'")], **kwargs) -- 2.47.3