[v2,02/14] tests/vm: Debug mode shows ssh output.

Message ID	20200219163537.22098-3-robert.foley@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: Robert Foley <robert.foley@linaro.org> To: qemu-devel@nongnu.org Subject: [PATCH v2 02/14] tests/vm: Debug mode shows ssh output. Date: Wed, 19 Feb 2020 11:35:25 -0500 Message-Id: <20200219163537.22098-3-robert.foley@linaro.org> In-Reply-To: <20200219163537.22098-1-robert.foley@linaro.org> References: <20200219163537.22098-1-robert.foley@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Cc: philmd@redhat.com, alex.bennee@linaro.org, robert.foley@linaro.org, peter.puhov@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	tests/vm: Add support for aarch64 VMs \| expand [v2,00/14] tests/vm: Add support for aarch64 VMs [v2,01/14] tests/vm: use $(PYTHON) consistently [v2,02/14] tests/vm: Debug mode shows ssh output. [v2,03/14] tests/vm: increased max timeout for vm boot. [v2,04/14] tests/vm: give wait_ssh() option to wait for root [v2,05/14] tests/vm: Added gen_cloud_init_iso() to basevm.py [v2,06/14] tests/vm: Add workaround to consume console [v2,07/14] tests/vm: Add configuration to basevm.py [v2,08/14] tests/vm: Added configuration file support [v2,09/14] tests/vm: add --boot-console switch [v2,10/14] tests/vm: Add ability to select QEMU from current build. [v2,11/14] tests/vm: allow wait_ssh() to specify command [v2,12/14] tests/vm: Added a new script for ubuntu.aarch64. [v2,13/14] tests/vm: Added a new script for centos.aarch64. [v2,14/14] tests/vm: change scripts to use self._config

Message ID

20200219163537.22098-3-robert.foley@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	209.51.188.17 as permitted sender) client-ip=209.51.188.17; 
From: Robert Foley <robert.foley@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v2 02/14] tests/vm: Debug mode shows ssh output.
Date: Wed, 19 Feb 2020 11:35:25 -0500
Message-Id: <20200219163537.22098-3-robert.foley@linaro.org>
In-Reply-To: <20200219163537.22098-1-robert.foley@linaro.org>
References: <20200219163537.22098-1-robert.foley@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Cc: philmd@redhat.com, alex.bennee@linaro.org, robert.foley@linaro.org,
	peter.puhov@linaro.org
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

tests/vm: Add support for aarch64 VMs | expand

Commit Message

Robert Foley Feb. 19, 2020, 4:35 p.m. UTC

Add changes to tests/vm/basevm.py so that during debug mode we show ssh output.

Signed-off-by: Robert Foley <robert.foley@linaro.org>

Reviewed-by: Peter Puhov <peter.puhov@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

---
 tests/vm/basevm.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

-- 
2.17.1

diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 4dee6647e6..c99725b8c0 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -120,11 +120,16 @@  class BaseVM(object):
         return fname
 
     def _ssh_do(self, user, cmd, check):
-        ssh_cmd = ["ssh", "-q", "-t",
+        ssh_cmd = ["ssh",
+                   "-t",
                    "-o", "StrictHostKeyChecking=no",
                    "-o", "UserKnownHostsFile=" + os.devnull,
                    "-o", "ConnectTimeout=1",
                    "-p", self.ssh_port, "-i", self._ssh_key_file]
+        # If not in debug mode, set ssh to quiet mode to
+        # avoid printing the results of commands.
+        if not self.debug:
+            ssh_cmd.append("-q")
         for var in self.envvars:
             ssh_cmd += ['-o', "SendEnv=%s" % var ]
         assert not isinstance(cmd, str)

[v2,02/14] tests/vm: Debug mode shows ssh output.

Commit Message

Patch