diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-08-15 15:37:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-15 15:37:26 +0000 |
| commit | 8361073662d580803f1da030b9f9bd4203bbaecb (patch) | |
| tree | 406f8dfa7742b71c8416f65c6847877ea0415fa6 | |
| parent | 57e7210178c975b3e29fb8ef5be459f9ce93e646 (diff) | |
| parent | dc2a70ed32ac3a7919d0891b50bb621b226d5bc9 (diff) | |
Merge "bug fix: ssh authentiation error when run compass scenario in fuel"
| -rw-r--r-- | tests/unit/test_ssh.py | 4 | ||||
| -rw-r--r-- | yardstick/ssh.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/unit/test_ssh.py b/tests/unit/test_ssh.py index 574da0343..a27052462 100644 --- a/tests/unit/test_ssh.py +++ b/tests/unit/test_ssh.py @@ -108,7 +108,9 @@ class SSHTestCase(unittest.TestCase): mock.call.set_missing_host_key_policy("autoadd"), mock.call.connect("example.net", username="admin", port=22, pkey="key", key_filename=None, - password=None, timeout=1), + password=None, + allow_agent=False, look_for_keys=False, + timeout=1), ] self.assertEqual(client_calls, client.mock_calls) diff --git a/yardstick/ssh.py b/yardstick/ssh.py index 2816a1c7d..cf890df6f 100644 --- a/yardstick/ssh.py +++ b/yardstick/ssh.py @@ -121,7 +121,9 @@ class SSH(object): self._client.connect(self.host, username=self.user, port=self.port, pkey=self.pkey, key_filename=self.key_filename, - password=self.password, timeout=1) + password=self.password, + allow_agent=False, look_for_keys=False, + timeout=1) return self._client except Exception as e: message = ("Exception %(exception_type)s was raised " |