diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2023-01-11 20:24:13 -0500 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2023-01-11 20:24:13 -0500 |
commit | ec8948158e26df0ec549e333cc2ea4bb22d56350 (patch) | |
tree | 605531478922a9b56d867e8044387711f32b68d2 /tests | |
parent | 19a00412bfecd43d4fa6a13459955ccb13f29e02 (diff) |
blacken
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_client.py | 4 | ||||
-rw-r--r-- | tests/test_file.py | 2 | ||||
-rw-r--r-- | tests/test_kex.py | 2 | ||||
-rw-r--r-- | tests/test_message.py | 24 | ||||
-rw-r--r-- | tests/test_packetizer.py | 2 | ||||
-rw-r--r-- | tests/test_transport.py | 8 | ||||
-rw-r--r-- | tests/util.py | 1 |
7 files changed, 21 insertions, 22 deletions
diff --git a/tests/test_client.py b/tests/test_client.py index a0dcab1a..cb34348a 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -803,7 +803,7 @@ class PasswordPassphraseTests(ClientTest): @requires_sha1_signing def test_password_kwarg_used_for_passphrase_when_no_passphrase_kwarg_given( - self + self, ): # noqa # Backwards compatibility: passphrase in the password field. self._test_connection( @@ -814,7 +814,7 @@ class PasswordPassphraseTests(ClientTest): @raises(AuthenticationException) # TODO: more granular @requires_sha1_signing def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given( # noqa - self + self, ): # Sanity: if we're given both fields, the password field is NOT used as # a passphrase. diff --git a/tests/test_file.py b/tests/test_file.py index b0147450..bcd1ad2b 100644 --- a/tests/test_file.py +++ b/tests/test_file.py @@ -189,7 +189,7 @@ class BufferedFileTest(unittest.TestCase): self.assertRaises(TypeError, f.write, object()) def test_write_unicode_as_binary(self): - text = u"\xa7 why is writing text to a binary file allowed?\n" + text = "\xa7 why is writing text to a binary file allowed?\n" with LoopbackFile("rb+") as f: f.write(text) self.assertEqual(f.read(), text.encode("utf-8")) diff --git a/tests/test_kex.py b/tests/test_kex.py index 24fb8b81..45a691f2 100644 --- a/tests/test_kex.py +++ b/tests/test_kex.py @@ -47,7 +47,7 @@ from paramiko.kex_curve25519 import KexCurve25519 def dummy_urandom(n): - return byte_chr(0xcc) * n + return byte_chr(0xCC) * n def dummy_generate_key_pair(obj): diff --git a/tests/test_message.py b/tests/test_message.py index 23b06858..bd2d5795 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -48,18 +48,18 @@ class MessageTest(unittest.TestCase): msg = Message() msg.add_boolean(True) msg.add_boolean(False) - msg.add_byte(byte_chr(0xf3)) + msg.add_byte(byte_chr(0xF3)) - msg.add_bytes(zero_byte + byte_chr(0x3f)) + msg.add_bytes(zero_byte + byte_chr(0x3F)) msg.add_list(["huey", "dewey", "louie"]) self.assertEqual(msg.asbytes(), self.__b) msg = Message() msg.add_int64(5) - msg.add_int64(0xf5e4d3c2b109) + msg.add_int64(0xF5E4D3C2B109) msg.add_mpint(17) - msg.add_mpint(0xf5e4d3c2b109) - msg.add_mpint(-0x65e4d3c2b109) + msg.add_mpint(0xF5E4D3C2B109) + msg.add_mpint(-0x65E4D3C2B109) self.assertEqual(msg.asbytes(), self.__c) def test_decode(self): @@ -73,22 +73,22 @@ class MessageTest(unittest.TestCase): msg = Message(self.__b) self.assertEqual(msg.get_boolean(), True) self.assertEqual(msg.get_boolean(), False) - self.assertEqual(msg.get_byte(), byte_chr(0xf3)) - self.assertEqual(msg.get_bytes(2), zero_byte + byte_chr(0x3f)) + self.assertEqual(msg.get_byte(), byte_chr(0xF3)) + self.assertEqual(msg.get_bytes(2), zero_byte + byte_chr(0x3F)) self.assertEqual(msg.get_list(), ["huey", "dewey", "louie"]) msg = Message(self.__c) self.assertEqual(msg.get_int64(), 5) - self.assertEqual(msg.get_int64(), 0xf5e4d3c2b109) + self.assertEqual(msg.get_int64(), 0xF5E4D3C2B109) self.assertEqual(msg.get_mpint(), 17) - self.assertEqual(msg.get_mpint(), 0xf5e4d3c2b109) - self.assertEqual(msg.get_mpint(), -0x65e4d3c2b109) + self.assertEqual(msg.get_mpint(), 0xF5E4D3C2B109) + self.assertEqual(msg.get_mpint(), -0x65E4D3C2B109) def test_add(self): msg = Message() msg.add(5) msg.add(0x1122334455) - msg.add(0xf00000000000000000) + msg.add(0xF00000000000000000) msg.add(True) msg.add("cat") msg.add(["a", "b"]) @@ -98,7 +98,7 @@ class MessageTest(unittest.TestCase): msg = Message(self.__d) self.assertEqual(msg.get_adaptive_int(), 5) self.assertEqual(msg.get_adaptive_int(), 0x1122334455) - self.assertEqual(msg.get_adaptive_int(), 0xf00000000000000000) + self.assertEqual(msg.get_adaptive_int(), 0xF00000000000000000) self.assertEqual(msg.get_so_far(), self.__d[:29]) self.assertEqual(msg.get_remainder(), self.__d[29:]) msg.rewind() diff --git a/tests/test_packetizer.py b/tests/test_packetizer.py index 27dee358..d4dd58ad 100644 --- a/tests/test_packetizer.py +++ b/tests/test_packetizer.py @@ -34,7 +34,7 @@ from .loop import LoopSocket x55 = byte_chr(0x55) -x1f = byte_chr(0x1f) +x1f = byte_chr(0x1F) class PacketizerTest(unittest.TestCase): diff --git a/tests/test_transport.py b/tests/test_transport.py index 177e83da..d5cb5576 100644 --- a/tests/test_transport.py +++ b/tests/test_transport.py @@ -686,7 +686,7 @@ class TransportTest(unittest.TestCase): self.assertEqual(chan.send_ready(), True) total = 0 K = "*" * 1024 - limit = 1 + (64 * 2 ** 15) + limit = 1 + (64 * 2**15) while total < limit: chan.send(K) total += len(K) @@ -874,7 +874,7 @@ class TransportTest(unittest.TestCase): for val, correct in [ (4095, MIN_PACKET_SIZE), (None, DEFAULT_MAX_PACKET_SIZE), - (2 ** 32, MAX_WINDOW_SIZE), + (2**32, MAX_WINDOW_SIZE), ]: self.assertEqual(self.tc._sanitize_packet_size(val), correct) @@ -885,7 +885,7 @@ class TransportTest(unittest.TestCase): for val, correct in [ (32767, MIN_WINDOW_SIZE), (None, DEFAULT_WINDOW_SIZE), - (2 ** 32, MAX_WINDOW_SIZE), + (2**32, MAX_WINDOW_SIZE), ]: self.assertEqual(self.tc._sanitize_window_size(val), correct) @@ -950,7 +950,7 @@ class TransportTest(unittest.TestCase): verify behaviours sending various instances to a channel """ self.setup_test_server() - text = u"\xa7 slice me nicely" + text = "\xa7 slice me nicely" with self.tc.open_session() as chan: schan = self.ts.accept(1.0) if schan is None: diff --git a/tests/util.py b/tests/util.py index f3efb6b0..00642cb0 100644 --- a/tests/util.py +++ b/tests/util.py @@ -78,7 +78,6 @@ if ( def tearDownClass(cls): del cls.realm - else: try: # Try to setup a kerberos environment |