Some additional badly named tests that I guess weren't in master?

4 files changed, 23 insertions, 23 deletions

diff --git a/tests/test_auth.py b/tests/test_auth.py
index 0f8ffc54..01fbac5b 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -142,7 +142,7 @@ class AuthTest(unittest.TestCase):
         self.assertTrue(self.event.is_set())
         self.assertTrue(self.ts.is_active())
 
-    def test_1_bad_auth_type(self):
+    def test_bad_auth_type(self):
         """
         verify that we get the right exception when an unsupported auth
         type is requested.
@@ -160,7 +160,7 @@ class AuthTest(unittest.TestCase):
             self.assertEqual(BadAuthenticationType, etype)
             self.assertEqual(["publickey"], evalue.allowed_types)
 
-    def test_2_bad_password(self):
+    def test_bad_password(self):
         """
         verify that a bad password gets the right exception, and that a retry
         with the right password works.
@@ -176,7 +176,7 @@ class AuthTest(unittest.TestCase):
         self.tc.auth_password(username="slowdive", password="pygmalion")
         self.verify_finished()
 
-    def test_3_multipart_auth(self):
+    def test_multipart_auth(self):
         """
         verify that multipart auth works.
         """
@@ -191,7 +191,7 @@ class AuthTest(unittest.TestCase):
         self.assertEqual([], remain)
         self.verify_finished()
 
-    def test_4_interactive_auth(self):
+    def test_interactive_auth(self):
         """
         verify keyboard-interactive auth works.
         """
@@ -210,7 +210,7 @@ class AuthTest(unittest.TestCase):
         self.assertEqual([], remain)
         self.verify_finished()
 
-    def test_5_interactive_auth_fallback(self):
+    def test_interactive_auth_fallback(self):
         """
         verify that a password auth attempt will fallback to "interactive"
         if password auth isn't supported but interactive is.
@@ -221,7 +221,7 @@ class AuthTest(unittest.TestCase):
         self.assertEqual([], remain)
         self.verify_finished()
 
-    def test_6_auth_utf8(self):
+    def test_auth_utf8(self):
         """
         verify that utf-8 encoding happens in authentication.
         """
@@ -231,7 +231,7 @@ class AuthTest(unittest.TestCase):
         self.assertEqual([], remain)
         self.verify_finished()
 
-    def test_7_auth_non_utf8(self):
+    def test_auth_non_utf8(self):
         """
         verify that non-utf-8 encoded passwords can be used for broken
         servers.
@@ -242,7 +242,7 @@ class AuthTest(unittest.TestCase):
         self.assertEqual([], remain)
         self.verify_finished()
 
-    def test_8_auth_gets_disconnected(self):
+    def test_auth_gets_disconnected(self):
         """
         verify that we catch a server disconnecting during auth, and report
         it as an auth failure.
@@ -256,7 +256,7 @@ class AuthTest(unittest.TestCase):
             self.assertTrue(issubclass(etype, AuthenticationException))
 
     @slow
-    def test_9_auth_non_responsive(self):
+    def test_auth_non_responsive(self):
         """
         verify that authentication times out if server takes to long to
         respond (or never responds).
diff --git a/tests/test_client.py b/tests/test_client.py
index 1707d015..98f72143 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -245,7 +245,7 @@ class SSHClientTest(ClientTest):
         """
         self._test_connection(key_filename=_support("test_rsa.key"))
 
-    def test_5_client_ecdsa(self):
+    def test_client_ecdsa(self):
         """
         verify that SSHClient works with an ECDSA key.
         """
diff --git a/tests/test_kex.py b/tests/test_kex.py
index 6e446f82..69492ee2 100644
--- a/tests/test_kex.py
+++ b/tests/test_kex.py
@@ -123,7 +123,7 @@ class KexTest(unittest.TestCase):
         os.urandom = self._original_urandom
         KexNistp256._generate_key_pair = self._original_generate_key_pair
 
-    def test_1_group1_client(self):
+    def test_group1_client(self):
         transport = FakeTransport()
         transport.server_mode = False
         kex = KexGroup1(transport)
@@ -147,7 +147,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual((b"fake-host-key", b"fake-sig"), transport._verify)
         self.assertTrue(transport._activated)
 
-    def test_2_group1_server(self):
+    def test_group1_server(self):
         transport = FakeTransport()
         transport.server_mode = True
         kex = KexGroup1(transport)
@@ -167,7 +167,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual(x, hexlify(transport._message.asbytes()).upper())
         self.assertTrue(transport._activated)
 
-    def test_3_gex_client(self):
+    def test_gex_client(self):
         transport = FakeTransport()
         transport.server_mode = False
         kex = KexGex(transport)
@@ -201,7 +201,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual((b"fake-host-key", b"fake-sig"), transport._verify)
         self.assertTrue(transport._activated)
 
-    def test_4_gex_old_client(self):
+    def test_gex_old_client(self):
         transport = FakeTransport()
         transport.server_mode = False
         kex = KexGex(transport)
@@ -235,7 +235,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual((b"fake-host-key", b"fake-sig"), transport._verify)
         self.assertTrue(transport._activated)
 
-    def test_5_gex_server(self):
+    def test_gex_server(self):
         transport = FakeTransport()
         transport.server_mode = True
         kex = KexGex(transport)
@@ -272,7 +272,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual(x, hexlify(transport._message.asbytes()).upper())
         self.assertTrue(transport._activated)
 
-    def test_6_gex_server_with_old_client(self):
+    def test_gex_server_with_old_client(self):
         transport = FakeTransport()
         transport.server_mode = True
         kex = KexGex(transport)
@@ -307,7 +307,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual(x, hexlify(transport._message.asbytes()).upper())
         self.assertTrue(transport._activated)
 
-    def test_7_gex_sha256_client(self):
+    def test_gex_sha256_client(self):
         transport = FakeTransport()
         transport.server_mode = False
         kex = KexGexSHA256(transport)
@@ -341,7 +341,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual((b"fake-host-key", b"fake-sig"), transport._verify)
         self.assertTrue(transport._activated)
 
-    def test_8_gex_sha256_old_client(self):
+    def test_gex_sha256_old_client(self):
         transport = FakeTransport()
         transport.server_mode = False
         kex = KexGexSHA256(transport)
@@ -375,7 +375,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual((b"fake-host-key", b"fake-sig"), transport._verify)
         self.assertTrue(transport._activated)
 
-    def test_9_gex_sha256_server(self):
+    def test_gex_sha256_server(self):
         transport = FakeTransport()
         transport.server_mode = True
         kex = KexGexSHA256(transport)
@@ -412,7 +412,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual(x, hexlify(transport._message.asbytes()).upper())
         self.assertTrue(transport._activated)
 
-    def test_10_gex_sha256_server_with_old_client(self):
+    def test_gex_sha256_server_with_old_client(self):
         transport = FakeTransport()
         transport.server_mode = True
         kex = KexGexSHA256(transport)
@@ -447,7 +447,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual(x, hexlify(transport._message.asbytes()).upper())
         self.assertTrue(transport._activated)
 
-    def test_11_kex_nistp256_client(self):
+    def test_kex_nistp256_client(self):
         K = 91610929826364598472338906427792435253694642563583721654249504912114314269754  # noqa
         transport = FakeTransport()
         transport.server_mode = False
@@ -473,7 +473,7 @@ class KexTest(unittest.TestCase):
         self.assertEqual((b"fake-host-key", b"fake-sig"), transport._verify)
         self.assertTrue(transport._activated)
 
-    def test_12_kex_nistp256_server(self):
+    def test_kex_nistp256_server(self):
         K = 91610929826364598472338906427792435253694642563583721654249504912114314269754  # noqa
         transport = FakeTransport()
         transport.server_mode = True
diff --git a/tests/test_sftp.py b/tests/test_sftp.py
index 395942cc..e4e18e5a 100644
--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
@@ -250,7 +250,7 @@ class TestSFTP(object):
             sftp.remove(sftp.FOLDER + "/fish.txt")
             sftp.remove(sftp.FOLDER + "/tertiary.py")
 
-    def test_5_listdir_iter(self, sftp):
+    def test_listdir_iter(self, sftp):
         """
         listdir_iter version of above test
         """