qa: simplify run_shell argument processing

No functional changes.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit c3707b99c38ab153149684488276c76be6186d8f)

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index 5263c5bfac4702c7086401e40ad989764673a5a2..007be38e223f7b855147dfff2537356bdc7aaeb6 100644 (file)
--- 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}'")]