Re: [PATCH 1/8] tests/vm: Debug mode shows ssh output.

[Alex Bennée]

Robert Foley <address@hidden> writes:

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

nit: space

>
> Signed-off-by: Robert Foley <address@hidden>
> Reviewed-by: Peter Puhov <address@hidden>

Reviewed-by: Alex Bennée <address@hidden>

> ---
>  tests/vm/basevm.py | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
> index ed5dd4f3d0..991115e44b 100755
> --- a/tests/vm/basevm.py
> +++ b/tests/vm/basevm.py
> @@ -122,11 +122,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)


-- 
Alex Bennée