diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-06 12:31:57 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-06 12:31:57 -0700 |
| commit | a2da21d46bb9a441dbb8da570262bb424e1f9450 (patch) | |
| tree | 8e1c7bdd402fb640f75b061bc2051f5fe6eba676 /tests/test_client.py | |
| parent | 79fcbdad812cc3be39afbf8375c11e0581eeb86e (diff) | |
| parent | d285b80ecb6102b0ad501b74d02e04d61e8ec632 (diff) | |
Merge branch '2.0' into 667-int
Diffstat (limited to 'tests/test_client.py')
| -rw-r--r-- | tests/test_client.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test_client.py b/tests/test_client.py index f42d79d9..9c5761d6 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -182,7 +182,7 @@ class SSHClientTest (unittest.TestCase): """ verify that SSHClient works with an ECDSA key. """ - self._test_connection(key_filename=test_path('test_ecdsa.key')) + self._test_connection(key_filename=test_path('test_ecdsa_256.key')) def test_3_multiple_key_files(self): """ @@ -199,8 +199,8 @@ class SSHClientTest (unittest.TestCase): for attempt, accept in ( (['rsa', 'dss'], ['dss']), # Original test #3 (['dss', 'rsa'], ['dss']), # Ordering matters sometimes, sadly - (['dss', 'rsa', 'ecdsa'], ['dss']), # Try ECDSA but fail - (['rsa', 'ecdsa'], ['ecdsa']), # ECDSA success + (['dss', 'rsa', 'ecdsa_256'], ['dss']), # Try ECDSA but fail + (['rsa', 'ecdsa_256'], ['ecdsa']), # ECDSA success ): try: self._test_connection( @@ -357,7 +357,7 @@ class SSHClientTest (unittest.TestCase): # NOTE: re #387, re #394 # If pkey module used within Client._auth isn't correctly handling auth # errors (e.g. if it allows things like ValueError to bubble up as per - # midway thru #394) client.connect() will fail (at key load step) + # midway through #394) client.connect() will fail (at key load step) # instead of succeeding (at password step) kwargs = dict( # Password-protected key whose passphrase is not 'pygmalion' (it's |