diff options
| author | Robert Foley | 2020-03-03 16:06:15 +0100 |
|---|---|---|
| committer | Alex Bennée | 2020-03-04 10:57:23 +0100 |
| commit | 89adc5b918c5ed42eaa03997360010d3d940e342 (patch) | |
| tree | dd30186df0a182eb38c279b1fdf1b350ce3372ac /tests/vm/basevm.py | |
| parent | tests/vm: use $(PYTHON) consistently (diff) | |
| download | qemu-89adc5b918c5ed42eaa03997360010d3d940e342.tar.gz qemu-89adc5b918c5ed42eaa03997360010d3d940e342.tar.xz qemu-89adc5b918c5ed42eaa03997360010d3d940e342.zip | |
tests/vm: Debug mode shows ssh output.
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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200219163537.22098-3-robert.foley@linaro.org>
Message-Id: <20200303150622.20133-3-alex.bennee@linaro.org>
Diffstat (limited to 'tests/vm/basevm.py')
| -rw-r--r-- | tests/vm/basevm.py | 7 |
1 files changed, 6 insertions, 1 deletions
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) |