Merge PR378: allow custom reactor selection better

src/wormhole/test/test_transit.py

@@ -1312,8 +1312,8 @@ class Transit(unittest.TestCase):
 
     @inlineCallbacks
     def test_success_direct(self):
-        clock = task.Clock()
-        s = transit.TransitSender("", reactor=clock)
+        reactor = mock.Mock()
+        s = transit.TransitSender("", reactor=reactor)
         s.set_transit_key(b"key")
         hints = yield s.get_connection_hints()  # start the listener
         del hints

src/wormhole/transit.py

@@ -11,7 +11,7 @@ from collections import deque
 import six
 from nacl.secret import SecretBox
 from twisted.internet import (address, defer, endpoints, error, interfaces,
-                              protocol, reactor, task)
+                              protocol, task)
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.protocols import policies
 from twisted.python import log
@@ -559,7 +559,7 @@ class Common:
                  transit_relay,
                  no_listen=False,
                  tor=None,
-                 reactor=reactor,
+                 reactor=None,
                  timing=None):
         self._side = bytes_to_hexstr(os.urandom(8))  # unicode
         if transit_relay:
@@ -579,6 +579,8 @@ class Common:
         self._waiting_for_transit_key = []
         self._listener = None
         self._winner = None
+        if reactor is None:
+            from twisted.internet import reactor
         self._reactor = reactor
         self._timing = timing or DebugTiming()
         self._timing.add("transit")
@@ -596,7 +598,7 @@ class Common:
         direct_hints = [
             DirectTCPV1Hint(six.u(addr), portnum, 0.0) for addr in addresses
         ]
-        ep = endpoints.serverFromString(reactor, "tcp:%d" % portnum)
+        ep = endpoints.serverFromString(self._reactor, "tcp:%d" % portnum)
         return direct_hints, ep
 
     def get_connection_abilities(self):