From eeebd15c42936bab9987d24977e5e0fbc58c6f80 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 16 Dec 2020 09:15:37 -0500
Subject: [PATCH] Take Mock out of ``allmydata.test.test_connections.TCP``

---
 src/allmydata/node.py                  |  4 +--
 src/allmydata/test/test_connections.py | 50 ++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index c5433c33c..e08c07508 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -669,8 +669,8 @@ def create_connection_handlers(config, i2p_provider, tor_provider):
     # create that handler, so hints which want it will be ignored.
     handlers = {
         "tcp": _make_tcp_handler(),
-        "tor": tor_provider.get_tor_handler(),
-        "i2p": i2p_provider.get_i2p_handler(),
+        "tor": tor_provider.get_client_endpoint(),
+        "i2p": i2p_provider.get_client_endpoint(),
     }
     log.msg(
         format="built Foolscap connection handlers for: %(known_handlers)s",
diff --git a/src/allmydata/test/test_connections.py b/src/allmydata/test/test_connections.py
index 30aac8446..a5746ced1 100644
--- a/src/allmydata/test/test_connections.py
+++ b/src/allmydata/test/test_connections.py
@@ -1,31 +1,67 @@
 import os
 import mock
+
 from twisted.trial import unittest
 from twisted.internet import reactor, endpoints, defer
 from twisted.internet.interfaces import IStreamClientEndpoint
+
 from foolscap.connections import tcp
+
+from testtools.matchers import (
+    MatchesDict,
+    IsInstance,
+    Equals,
+)
+
 from ..node import PrivacyError, config_from_string
 from ..node import create_connection_handlers
 from ..node import create_main_tub
 from ..util.i2p_provider import create as create_i2p_provider
 from ..util.tor_provider import create as create_tor_provider
 
+from .common import (
+    SyncTestCase,
+    ConstantAddresses,
+)
+
 
 BASECONFIG = ""
 
 
-class TCP(unittest.TestCase):
-
-    def test_default(self):
+class CreateConnectionHandlersTests(SyncTestCase):
+    """
+    Tests for the Foolscap connection handlers return by
+    ``create_connection_handlers``.
+    """
+    def test_foolscap_handlers(self):
+        """
+        ``create_connection_handlers`` returns a Foolscap connection handlers
+        dictionary mapping ``"tcp"`` to
+        ``foolscap.connections.tcp.DefaultTCP``, ``"tor"`` to the supplied Tor
+        provider's handler, and ``"i2p"`` to the supplied I2P provider's
+        handler.
+        """
         config = config_from_string(
             "fake.port",
             "no-basedir",
             BASECONFIG,
         )
-        _, foolscap_handlers = create_connection_handlers(config, mock.Mock(), mock.Mock())
-        self.assertIsInstance(
-            foolscap_handlers['tcp'],
-            tcp.DefaultTCP,
+        tor_endpoint = object()
+        tor = ConstantAddresses(handler=tor_endpoint)
+        i2p_endpoint = object()
+        i2p = ConstantAddresses(handler=i2p_endpoint)
+        _, foolscap_handlers = create_connection_handlers(
+            config,
+            i2p,
+            tor,
+        )
+        self.assertThat(
+            foolscap_handlers,
+            MatchesDict({
+                "tcp": IsInstance(tcp.DefaultTCP),
+                "i2p": Equals(i2p_endpoint),
+                "tor": Equals(tor_endpoint),
+            }),
         )