]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/cephfs: make run_shell() accept args as str too 35391/head
authorRishabh Dave <ridave@redhat.com>
Fri, 19 Jul 2019 08:18:51 +0000 (13:48 +0530)
committerNathan Cutler <ncutler@suse.com>
Tue, 9 Jun 2020 12:44:10 +0000 (14:44 +0200)
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit a83ea849d7d2096762a125b8c6dbb8eb9988b2a9)

Conflicts:
qa/tasks/cephfs/mount.py
- in nautilus, run_shell doesn't take a "stdin" argument

qa/tasks/cephfs/mount.py

index e56010b4aa521d230176496aa8080d9aad2ea2a7..cd51632fa2429e81e3a69741f9429d5cfcfa33de 100644 (file)
@@ -158,6 +158,9 @@ class CephFSMount(object):
         return six.ensure_str(p.stdout.getvalue().strip())
 
     def run_shell(self, args, wait=True, check_status=True, omit_sudo=True):
+        if isinstance(args, str):
+            args = args.split()
+
         args = ["cd", self.mountpoint, run.Raw('&&'), "sudo"] + args
         return self.client_remote.run(args=args, stdout=StringIO(),
                                       stderr=StringIO(), wait=wait,