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
commit29dc52dca719ded18b8e527512423e525fdff9ca (patch)
tree3cf2328f65e51204e39ee713dfe0f82c95a7c64f
parent26ae0c9b452b4fa395aa89a010e855cbe10780e6 (diff)
parent84a47dc076ce9bf97dec04929dab73cac7a841fe (diff)
downloadparamiko-29dc52dca719ded18b8e527512423e525fdff9ca.tar.gz
Merge branch '2.2' into 2.3
-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 4e84da7b..a43140ed 100644
--- a/tests/test_pkey.py
+++ b/tests/test_pkey.py
@@ -470,11 +470,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