diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2017-11-22 14:37:46 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2017-12-31 16:10:47 -0500 |
commit | 3d0b762ecf95c910d711a042fd532122aed3e436 (patch) | |
tree | 6383b417bd6f9e931b8a5048dc5983f8546bf614 | |
parent | 84adbb73b0e5d73c259999c9952c7ff339cd1677 (diff) | |
download | paramiko-3d0b762ecf95c910d711a042fd532122aed3e436.tar.gz |
Can't figure out why any tests use the host key.
Transport.connect has supported skipping host key check, implicitly,
for 14 years...
-rw-r--r-- | tests/test_auth.py | 17 | ||||
-rw-r--r-- | tests/test_transport.py | 10 |
2 files changed, 11 insertions, 16 deletions
diff --git a/tests/test_auth.py b/tests/test_auth.py index 258f4746..d1ba9bd2 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -77,8 +77,7 @@ class TestEdgeCaseFailures(TestAuth): """ self.start_server() with raises(BadAuthenticationType) as info: - self.tc.connect(hostkey=self.public_host_key, - username='unknown', password='error') + self.tc.connect(username='unknown', password='error') assert info.value.allowed_types == ['publickey'] def test_auth_gets_disconnected(self): @@ -87,7 +86,7 @@ class TestEdgeCaseFailures(TestAuth): it as an auth failure. """ self.start_server() - self.tc.connect(hostkey=self.public_host_key) + self.tc.connect() with raises(AuthenticationException): self.tc.auth_password('bad-server', 'hello') @@ -113,7 +112,7 @@ class TestPasswordAuth(TestAuth): with the right password works. """ self.start_server() - self.tc.connect(hostkey=self.public_host_key) + self.tc.connect() with raises(AuthenticationException): self.tc.auth_password(username='slowdive', password='error') self.tc.auth_password(username='slowdive', password='pygmalion') @@ -125,7 +124,7 @@ class TestPasswordAuth(TestAuth): if password auth isn't supported but interactive is. """ self.start_server() - self.tc.connect(hostkey=self.public_host_key) + self.tc.connect() remain = self.tc.auth_password('commie', 'cat') self.assertEqual([], remain) self.verify_finished() @@ -135,7 +134,7 @@ class TestPasswordAuth(TestAuth): verify that utf-8 encoding happens in authentication. """ self.start_server() - self.tc.connect(hostkey=self.public_host_key) + self.tc.connect() remain = self.tc.auth_password('utf8', _pwd) self.assertEqual([], remain) self.verify_finished() @@ -146,7 +145,7 @@ class TestPasswordAuth(TestAuth): servers. """ self.start_server() - self.tc.connect(hostkey=self.public_host_key) + self.tc.connect() remain = self.tc.auth_password('non-utf8', '\xff') self.assertEqual([], remain) self.verify_finished() @@ -159,7 +158,7 @@ class TestInteractiveAuth(TestAuth): verify keyboard-interactive auth works. """ self.start_server() - self.tc.connect(hostkey=self.public_host_key) + self.tc.connect() def handler(title, instructions, prompts): self.got_title = title @@ -181,7 +180,7 @@ class TestMultipartAuth(TestAuth): verify that multipart auth works. """ self.start_server() - self.tc.connect(hostkey=self.public_host_key) + self.tc.connect() remain = self.tc.auth_password( username='paranoid', password='paranoid', diff --git a/tests/test_transport.py b/tests/test_transport.py index 4ef9d805..3944b06e 100644 --- a/tests/test_transport.py +++ b/tests/test_transport.py @@ -89,8 +89,7 @@ class TransportTest(unittest.TestCase): self.server = NullServer() self.assertTrue(not event.is_set()) self.ts.start_server(event, self.server) - self.tc.connect(hostkey=public_host_key, - username='slowdive', password='pygmalion') + self.tc.connect(username='slowdive', password='pygmalion') event.wait(1.0) self.assertTrue(event.is_set()) self.assertTrue(self.ts.is_active()) @@ -146,8 +145,7 @@ class TransportTest(unittest.TestCase): self.assertEqual(False, self.tc.is_authenticated()) self.assertEqual(False, self.ts.is_authenticated()) self.ts.start_server(event, server) - self.tc.connect(hostkey=public_host_key, - username='slowdive', password='pygmalion') + self.tc.connect(username='slowdive', password='pygmalion') event.wait(1.0) self.assertTrue(event.is_set()) self.assertTrue(self.ts.is_active()) @@ -168,8 +166,7 @@ class TransportTest(unittest.TestCase): self.assertTrue(not event.is_set()) self.socks.send(LONG_BANNER) self.ts.start_server(event, server) - self.tc.connect(hostkey=public_host_key, - username='slowdive', password='pygmalion') + self.tc.connect(username='slowdive', password='pygmalion') event.wait(1.0) self.assertTrue(event.is_set()) self.assertTrue(self.ts.is_active()) @@ -786,7 +783,6 @@ class TransportTest(unittest.TestCase): self.tc.handshake_timeout = 0.000000000001 self.ts.start_server(event, server) self.assertRaises(EOFError, self.tc.connect, - hostkey=public_host_key, username='slowdive', password='pygmalion') |