From c3707b99c38ab153149684488276c76be6186d8f Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 6 Mar 2024 22:21:24 -0500 Subject: [PATCH] qa: simplify run_shell argument processing No functional changes. Signed-off-by: Patrick Donnelly --- qa/tasks/cephfs/mount.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index 5263c5bfac47..007be38e223f 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -776,15 +776,14 @@ class CephFSMount(object): p.wait() return p.stdout.getvalue().strip() - def run_shell(self, args, timeout=300, **kwargs): - omit_sudo = kwargs.pop('omit_sudo', False) - cwd = kwargs.pop('cwd', self.mountpoint) - stdout = kwargs.pop('stdout', StringIO()) - stderr = kwargs.pop('stderr', StringIO()) - - return self.client_remote.run(args=args, cwd=cwd, timeout=timeout, - stdout=stdout, stderr=stderr, - omit_sudo=omit_sudo, **kwargs) + def run_shell(self, args, **kwargs): + kwargs.setdefault('cwd', self.mountpoint) + kwargs.setdefault('omit_sudo', False) + kwargs.setdefault('stdout', StringIO()) + kwargs.setdefault('stderr', StringIO()) + kwargs.setdefault('timeout', 300) + + return self.client_remote.run(args=args, **kwargs) def run_shell_payload(self, payload, **kwargs): kwargs['args'] = ["bash", "-c", Raw(f"'{payload}'")] -- 2.47.3