]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/cephfs: refactor run_as_root() to user run_as_user()
authorRishabh Dave <ridave@redhat.com>
Thu, 11 Jun 2020 11:53:47 +0000 (17:23 +0530)
committerRishabh Dave <ridave@redhat.com>
Wed, 17 Jun 2020 17:42:59 +0000 (23:12 +0530)
Signed-off-by: Rishabh Dave <ridave@redhat.com>
qa/tasks/cephfs/mount.py

index 2cfa1cc3f7b0581970f1390006e9f8a79d2decbc..769058fa05b5112b10e5de5e851552d1119f5405 100644 (file)
@@ -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: