Allow Tor options to be passed to connect_to_tor

Author: DonnchaC

bwscanner/attacher.py

@@ -150,7 +150,8 @@ def add_single_port_exit(port):
 
 
 @defer.inlineCallbacks
-def connect_to_tor(launch_tor, circuit_build_timeout, control_port=9051):
+def connect_to_tor(launch_tor, circuit_build_timeout, control_port=None,
+                   tor_overrides=None):
     """
     Launch or connect to a Tor instance
 
@@ -167,16 +168,20 @@ def connect_to_tor(launch_tor, circuit_build_timeout, control_port=9051):
         'FetchDirInfoExtraEarly': 1,
     }
 
+    if tor_overrides:
+        tor_options.update(tor_overrides)
+
     if launch_tor:
         log.info("Spawning a new Tor instance.")
         # TODO: Pass in data_dir directory so consensus can be cached
         tor = yield txtorcon.launch(reactor)
     else:
         log.info("Trying to connect to a running Tor instance.")
-        tor = yield txtorcon.connect(
-            reactor,
-            endpoints.TCP4ClientEndpoint(reactor, "localhost", control_port)
-        )
+        if control_port:
+            endpoint = endpoints.TCP4ClientEndpoint(reactor, "localhost", control_port)
+        else:
+            endpoint = None
+        tor = yield txtorcon.connect(reactor, endpoint)
 
     # Get Tor state first to avoid a race conditions where CONF_CHANGED
     # messages are received while Txtorcon is reading the consensus.

test/template.py

@@ -14,8 +14,16 @@ class TorTestCase(unittest.TestCase):
     def setUp(self):
         self.tor_state = yield connect_to_tor(
                 launch_tor=False,
+                control_port=int(os.environ.get('CHUTNEY_CONTROL_PORT')),
                 circuit_build_timeout=30,
-                control_port=int(os.environ.get('CHUTNEY_CONTROL_PORT')))
+                # XXX: Avoid switching to regular descriptors in tests.
+                #      There is a race condition where the tests can
+                #      start running while the new consensus is still
+                #      being fetched and loaded by Txtorcon.
+                #
+                #      We should find a solution for this race.
+                tor_overrides={'UseMicroDescriptors': 1},
+        )
 
         self.attacher = SOCKSClientStreamAttacher(self.tor_state)
         yield self.tor_state.set_attacher(self.attacher, reactor)