From c47ed0b81bc536bc163bdc663a9462ae587a6b53 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Thu, 25 May 2023 13:11:32 -0400
Subject: Re-run regular Transport test suite with new experimental subclass
 too

---
 tests/test_transport.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/tests/test_transport.py b/tests/test_transport.py
index d8b6cb99..b2efd637 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -38,8 +38,10 @@ from paramiko import (
     SSHException,
     IncompatiblePeer,
     SecurityOptions,
+    ServiceRequestingTransport,
     Transport,
 )
+from paramiko.auth_handler import AuthOnlyHandler
 from paramiko import OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED
 from paramiko.common import (
     DEFAULT_MAX_PACKET_SIZE,
@@ -82,6 +84,10 @@ Maybe.
 
 
 class TransportTest(unittest.TestCase):
+    # TODO: this can get nuked once ServiceRequestingTransport becomes the
+    # only Transport, as it has this baked in.
+    _auth_handler_class = AuthHandler
+
     def setUp(self):
         self.socks = LoopSocket()
         self.sockc = LoopSocket()
@@ -1030,7 +1036,7 @@ class TransportTest(unittest.TestCase):
     def test_server_transports_reject_client_message_types(self):
         # TODO: handle Transport's own tables too, not just its inner auth
         # handler's table. See TODOs in auth_handler.py
-        some_handler = AuthHandler(self.tc)  # kludge to get _some_ AH instance
+        some_handler = self._auth_handler_class(self.tc)
         for message_type in some_handler._client_handler_table:
             self._send_client_message(message_type)
             self._expect_unimplemented()
@@ -1047,6 +1053,21 @@ class TransportTest(unittest.TestCase):
         self._expect_unimplemented()
 
 
+# TODO: for now this is purely a regression test. It needs actual tests of the
+# intentional new behavior too!
+class ServiceRequestingTransportTest(TransportTest):
+    _auth_handler_class = AuthOnlyHandler
+
+    def setUp(self):
+        # Copypasta (Transport init is load-bearing)
+        self.socks = LoopSocket()
+        self.sockc = LoopSocket()
+        self.sockc.link(self.socks)
+        # New class who dis
+        self.tc = ServiceRequestingTransport(self.sockc)
+        self.ts = ServiceRequestingTransport(self.socks)
+
+
 class AlgorithmDisablingTests(unittest.TestCase):
     def test_preferred_lists_default_to_private_attribute_contents(self):
         t = Transport(sock=Mock())
-- 
cgit v1.2.3