From d90c0a0e811b9936920365b12b7b78457832bfb1 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Thu, 21 Feb 2019 22:13:28 +0530 Subject: [PATCH] qa: add stdin parameter to run_shell Signed-off-by: Rishabh Dave --- qa/tasks/cephfs/mount.py | 5 +++-- qa/tasks/vstart_runner.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index 7bfa71b1d04..3efa624dd57 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -155,11 +155,12 @@ class CephFSMount(object): p.wait() return p.stdout.getvalue().strip() - def run_shell(self, args, wait=True, check_status=True, omit_sudo=True): + def run_shell(self, args, wait=True, stdin=None, check_status=True, + omit_sudo=True): args = ["cd", self.mountpoint, run.Raw('&&'), "sudo"] + args return self.client_remote.run(args=args, stdout=StringIO(), stderr=StringIO(), wait=wait, - check_status=check_status, + stdin=stdin, check_status=check_status, omit_sudo=omit_sudo) def open_no_data(self, basename): diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py index 58fadbbbea3..f2dc0972a0c 100644 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@ -459,12 +459,12 @@ class LocalFuseMount(FuseMount): # to avoid assumptions about daemons' pwd return os.path.abspath("./client.{0}.keyring".format(self.client_id)) - def run_shell(self, args, wait=True, check_status=True, omit_sudo=True): + def run_shell(self, args, wait=True, stdin=None, check_status=True, omit_sudo=True): # FIXME maybe should add a pwd arg to teuthology.orchestra so that # the "cd foo && bar" shenanigans isn't needed to begin with and # then we wouldn't have to special case this return self.client_remote.run(args, wait=wait, cwd=self.mountpoint, - check_status=check_status, + stdin=stdin, check_status=check_status, omit_sudo=omit_sudo) def run_as_user(self, args, user, wait=True, stdin=None, check_status=True): -- 2.39.5