summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2019-06-21 16:52:23 -0400
committerJeff Forcier <jeff@bitprophet.org>2019-06-21 16:52:23 -0400
commitf0e8c64727367713a12a30213ce48504ee0ba3d8 (patch)
treed714464764501dda198e9162b0cbb93e43bec6bf
parentb7af6829de1e4c4544334bca11fc777c6d350548 (diff)
parent29dc52dca719ded18b8e527512423e525fdff9ca (diff)
downloadparamiko-f0e8c64727367713a12a30213ce48504ee0ba3d8.tar.gz
Merge branch '2.3' into 2.4
-rw-r--r--tests/test_pkey.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/test_pkey.py b/tests/test_pkey.py
index 749bb5f5..0e60126a 100644
--- a/tests/test_pkey.py
+++ b/tests/test_pkey.py
@@ -469,11 +469,15 @@ class KeyTest(unittest.TestCase):
def test_ed25519_funky_padding(self):
# Proves #1306 by just not exploding with 'Invalid key'.
- Ed25519Key.from_private_key_file(_support("test_ed25519-funky-padding.key"))
+ Ed25519Key.from_private_key_file(
+ _support("test_ed25519-funky-padding.key")
+ )
def test_ed25519_funky_padding_with_passphrase(self):
# Proves #1306 by just not exploding with 'Invalid key'.
- Ed25519Key.from_private_key_file(_support("test_ed25519-funky-padding_password.key"), b"asdf")
+ Ed25519Key.from_private_key_file(
+ _support("test_ed25519-funky-padding_password.key"), b"asdf"
+ )
def test_ed25519_compare(self):
# verify that the private & public keys compare equal