refactor to use IOPump: one test passes

src/wormhole_transit_relay/test/common.py

@@ -1,28 +1,67 @@
 from twisted.test import proto_helpers
-from ..transit_server import Transit
+from twisted.internet.protocol import (
+    ServerFactory,
+    ClientFactory,
+    Protocol,
+)
+from twisted.test import iosim
+from ..transit_server import (
+    Transit,
+    TransitConnection,
+)
+
 
 class ServerBase:
     log_requests = False
 
     def setUp(self):
+        self._pumps = []
         self._lp = None
         if self.log_requests:
             blur_usage = None
         else:
             blur_usage = 60.0
         self._setup_relay(blur_usage=blur_usage)
-        self._transit_server._debug_log = self.log_requests
+
+    def flush(self):
+        for pump in self._pumps:
+            pump.flush()
 
     def _setup_relay(self, blur_usage=None, log_file=None, usage_db=None):
-        self._transit_server = Transit(blur_usage=blur_usage,
+        self._transit_server = Transit(
-                                       log_file=log_file, usage_db=usage_db)
+            blur_usage=blur_usage,
+            log_file=log_file,
+            usage_db=usage_db,
+        )
+        self._transit_server._debug_log = self.log_requests
 
     def new_protocol(self):
-        protocol = self._transit_server.buildProtocol(('127.0.0.1', 0))
+        server_protocol = self._transit_server.buildProtocol(('127.0.0.1', 0))
-        transport = proto_helpers.StringTransportWithDisconnection()
+
-        protocol.makeConnection(transport)
+        # XXX interface?
-        transport.protocol = protocol
+        class TransitClientProtocolTcp(Protocol):
-        return protocol
+            """
+            Speak the transit client protocol used by the tests over TCP
+            """
+            def send(self, data):
+                self.transport.write(data)
+
+            def disconnect(self):
+                self.transport.loseConnection()
+
+        client_factory = ClientFactory()
+        client_factory.protocol = TransitClientProtocolTcp
+        client_protocol = client_factory.buildProtocol(('127.0.0.1', 31337))
+
+        pump = iosim.connect(
+            server_protocol,
+            iosim.makeFakeServer(server_protocol),
+            client_protocol,
+            iosim.makeFakeClient(client_protocol),
+        )
+        pump.flush()
+        self._pumps.append(pump)
+        return client_protocol
 
     def tearDown(self):
         if self._lp:

src/wormhole_transit_relay/test/test_transit_server.py

@@ -41,10 +41,12 @@ class _Transit:
         token1 = b"\x00"*32
         side1 = b"\x01"*8
 
-        p1.dataReceived(handshake(token1, side1))
+        p1.send(handshake(token1, side1))
+        self.flush()
         self.assertEqual(self.count(), 1)
 
-        p1.transport.loseConnection()
+        p1.disconnect()
+        self.flush()
         self.assertEqual(self.count(), 0)
 
         # the token should be removed too