From: Rishabh Dave <ridave@gmail.com>
Date: Fri, 13 Mar 2020 07:03:50 +0000 (+0000)
Subject: qa/vstart_runner: update vstart_runner.LocalRemote.sh
X-Git-Tag: v16.1.0~2673^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2cc0ee709c36eabe03311a00b72295da468bccf4;p=ceph.git

qa/vstart_runner: update vstart_runner.LocalRemote.sh

Commit 9f6c764f10f replaces remote.run calls by remote.sh without
updating the definition of vstart_runner.LocalRemote.sh which breaks the
cephfs tests when executed locally.

Fixes: https://tracker.ceph.com/issues/44579
Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index b14966a1de0..f19cd112aa5 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -389,12 +389,22 @@ class LocalRemote(object):
 
         return proc
 
-    def sh(self, command, log_limit=1024, cwd=None, env=None, **kwargs):
-        if isinstance(command, list):
-            command=' '.join(command)
+    # XXX: for compatibility keep this method same teuthology.orchestra.remote.sh
+    def sh(self, script, **kwargs):
+        """
+        Shortcut for run method.
+
+        Usage:
+            my_name = remote.sh('whoami')
+            remote_date = remote.sh('date')
+        """
+        if 'stdout' not in kwargs:
+            kwargs['stdout'] = BytesIO()
+        if 'args' not in kwargs:
+            kwargs['args'] = script
+        proc = self.run(**kwargs)
+        return proc.stdout.getvalue()
 
-        return misc.sh(command=command, log_limit=log_limit, cwd=cwd,
-                        env=env)
 
 class LocalDaemon(object):
     def __init__(self, daemon_type, daemon_id):