summaryrefslogtreecommitdiffhomepage
path: root/tests/test_pkey.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-08-28 17:45:54 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-08-28 17:45:56 -0700
commit03df3cf9cd0f12cc04abe88a8674e6968363340c (patch)
treece82a9d68cfb3b4186b87c450f37686c8ae8b419 /tests/test_pkey.py
parentb942d94e2d59335f11f635164525a4f578ea6991 (diff)
Overhaul PublicBlob and use it better within RSAKey.
This allows server-side Paramiko code to correctly create cert-bearing RSAKey objects and thus verify client signatures, and now the test suite passes again, barring the stub tests. Re #1042
Diffstat (limited to 'tests/test_pkey.py')
-rw-r--r--tests/test_pkey.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/test_pkey.py b/tests/test_pkey.py
index 034331a2..dac1d02b 100644
--- a/tests/test_pkey.py
+++ b/tests/test_pkey.py
@@ -485,7 +485,7 @@ class KeyTest(unittest.TestCase):
# PKey.load_certificate
key = RSAKey.from_private_key_file(test_path('test_rsa.key'))
self.assertTrue(key.public_blob is None)
- key.load_certificate(pubkey_filename=test_path('test_rsa.key-cert.pub'))
+ key.load_certificate(test_path('test_rsa.key-cert.pub'))
self.assertTrue(key.public_blob is not None)
self.assertEqual(key.public_blob.key_type, 'ssh-rsa-cert-v01@openssh.com')
self.assertEqual(key.public_blob.comment, 'test_rsa.key.pub')
@@ -502,5 +502,8 @@ class KeyTest(unittest.TestCase):
# Prevented from loading certificate that doesn't match
key1 = Ed25519Key.from_private_key_file(test_path('test_ed25519.key'))
- self.assertRaises(ValueError, key1.load_certificate,
- pubkey_filename=test_path('test_rsa.key-cert.pub'))
+ self.assertRaises(
+ ValueError,
+ key1.load_certificate,
+ test_path('test_rsa.key-cert.pub'),
+ )