From 4c9811aae321cc2898b6a24865fe199edd9f42d9 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Thu, 11 Jun 2020 17:23:47 +0530 Subject: [PATCH] qa/cephfs: refactor run_as_root() to user run_as_user() Signed-off-by: Rishabh Dave --- qa/tasks/cephfs/mount.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index 2cfa1cc3f7b..769058fa05b 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -534,18 +534,12 @@ class CephFSMount(object): stdout=StringIO(), stderr=StringIO(), check_status=check_status, cwd=cwd) - def run_as_root(self, args, wait=True, stdin=None, check_status=True, - cwd=None): - if isinstance(args, str): - args = 'sudo ' + args - if isinstance(args, list): - args.insert(0, 'sudo') - if not cwd: - cwd = self.mountpoint - - return self.client_remote.run(args=args, wait=wait, stdin=stdin, - stdout=StringIO(), stderr=StringIO(), - check_status=check_status, cwd=cwd) + def run_as_root(self, **kwargs): + """ + Accepts same arguments as run_shell(). + """ + kwargs['user'] = 'root' + return self.run_as_user(**kwargs) def _verify(self, proc, retval=None, errmsg=None): if retval: -- 2.39.5