diff options
| author | Martin Packman <martin.packman@canonical.com> | 2016-04-15 18:14:56 +0000 |
|---|---|---|
| committer | Martin Packman <martin.packman@canonical.com> | 2016-04-15 18:14:56 +0000 |
| commit | f021fab45845b862315ace774f6ee14c6889b536 (patch) | |
| tree | 0c7ba455b4742b42542a91763c83cec3cf1869f3 | |
| parent | 2e3f28a132b1ee1a9b1adcd49357c2064dd95935 (diff) | |
Fix ssh virt server example and testbed errorssh_usage
Currently documentation for ssh runner directs the user to a command that results in an internal script error. Correct the example, and fix the syntax on that error path in the code.
| -rw-r--r-- | doc/README.running-tests.rst | 2 | ||||
| -rw-r--r-- | lib/adt_testbed.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/README.running-tests.rst b/doc/README.running-tests.rst index f30629e..7c13ae8 100644 --- a/doc/README.running-tests.rst +++ b/doc/README.running-tests.rst @@ -265,7 +265,7 @@ ssh ~~~ :: - adt-run ... --- ssh -l joe -h testhost.example.com + adt-run ... --- ssh -l joe -H testhost.example.com This is a generic runner for an externally set up testbed which assumes nothing else than a working ssh connection. This can call a "setup diff --git a/lib/adt_testbed.py b/lib/adt_testbed.py index 8613b1a..9a2abe2 100644 --- a/lib/adt_testbed.py +++ b/lib/adt_testbed.py @@ -357,7 +357,7 @@ class Testbed: self.bomb('unexpected whitespace-only line from the testbed') if ll[0] != keyword: if self.lastsend is None: - self.bomb("got banner `%s', expected `%s...'" + self.bomb("got banner `%s', expected `%s...'" % (l, keyword)) else: self.bomb("sent `%s', got `%s', expected `%s...'" % |