Rename TorState object to tor_state

Author: DonnchaC

test/template.py

@@ -12,18 +12,18 @@ class TorTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def setUp(self):
-        self.tor = yield connect_to_tor(
+        self.tor_state = yield connect_to_tor(
                 launch_tor=False,
                 circuit_build_timeout=30,
                 circuit_idle_timeout=30,
                 control_port=int(os.environ.get('CHUTNEY_CONTROL_PORT')))
 
-        self.attacher = SOCKSClientStreamAttacher(self.tor)
-        yield self.tor.set_attacher(self.attacher, reactor)
+        self.attacher = SOCKSClientStreamAttacher(self.tor_state)
+        yield self.tor_state.set_attacher(self.attacher, reactor)
 
     @property
     def routers(self):
-        return list(set(self.tor.routers.values()))
+        return list(set(self.tor_state.routers.values()))
 
     @property
     def exits(self):
@@ -35,7 +35,7 @@ def random_path(self):
 
     @defer.inlineCallbacks
     def tearDown(self):
-        yield self.tor.set_attacher(None, reactor)
-        yield self.tor.protocol.quit()
+        yield self.tor_state.set_attacher(None, reactor)
+        yield self.tor_state.protocol.quit()
         # seems to leave dirty reactor otherwise?
-        yield self.tor.protocol.transport.loseConnection()
+        yield self.tor_state.protocol.transport.loseConnection()

test/test_attacher.py

@@ -54,7 +54,7 @@ class TestSOCKSClientStreamAttacher(TorTestCase):
     def setUp(self):
         yield super(TestSOCKSClientStreamAttacher, self).setUp()
         # do not attach circuits automatically
-        yield self.tor.set_attacher(None, reactor)
+        yield self.tor_state.set_attacher(None, reactor)
 
     @defer.inlineCallbacks
     def test_create_circuit(self):

test/test_circuit.py

@@ -8,7 +8,7 @@ def test_exit_scan(self):
         all_exits = set(self.exits)
         num_circuits = 0
         seen = set()
-        for circuit in ExitScan(self.tor):
+        for circuit in ExitScan(self.tor_state):
             assert len(circuit) == 3
             assert 'exit' in circuit[-1].flags
             seen.add(circuit[-1])
@@ -20,7 +20,7 @@ def test_two_hop(self):
         all_r = set(self.routers)
         num_circuits = 0
         seen = set()
-        for circuit in TwoHop(self.tor):
+        for circuit in TwoHop(self.tor_state):
             assert len(circuit) == 2
             assert 'exit' in circuit[-1].flags
             num_circuits = num_circuits + 1

test/test_fetcher.py

@@ -32,15 +32,15 @@ class TestOnionRoutedTCPClientEndpoint(TorTestCase):
     def test_connect_tcp(self):
         endpoint = random.choice(self.routers)
         # Connect to a routers OR port as a general TCP connection test
-        ore = OnionRoutedTCPClientEndpoint(endpoint.ip, int(endpoint.or_port),
-                                           self.tor, self.random_path())
+        ore = OnionRoutedTCPClientEndpoint(str(endpoint.ip), int(endpoint.or_port),
+                                           self.tor_state, self.random_path())
         proto = yield ore.connect(MockProtocol())
         self.failUnlessIsInstance(proto, MockProtocol)
 
     @defer.inlineCallbacks
     def test_connect_tcp_fail(self):
         ore = OnionRoutedTCPClientEndpoint('127.0.0.1', 3,
-                                           self.tor, self.random_path())
+                                           self.tor_state, self.random_path())
         with self.assertRaises(ConnectionRefused):
             yield ore.connect(MockProtocol())
 
@@ -63,7 +63,7 @@ def render_GET(self, request):
     @defer.inlineCallbacks
     def test_do_request(self):
         agent = OnionRoutedAgent(reactor, path=self.random_path(),
-                                 state=self.tor)
+                                 state=self.tor_state)
         url = "http://127.0.0.1:{}".format(self.port)
         request = yield agent.request("GET", url)
         body = yield readBody(request)
@@ -72,7 +72,7 @@ def test_do_request(self):
     @defer.inlineCallbacks
     def test_do_failing_request(self):
         agent = OnionRoutedAgent(reactor, path=self.random_path(),
-                                 state=self.tor)
+                                 state=self.tor_state)
 
         url = "http://127.0.0.1:{}".format(3)
         with self.assertRaises(ConnectionRefused):

test/test_listener.py

@@ -31,8 +31,8 @@ class TestCircuitEventListener(TorTestCase):
     @defer.inlineCallbacks
     def setUp(self):
         yield super(TestCircuitEventListener, self).setUp()
-        self.circuit_event_listener = CircuitEventListener(self.tor)
-        self.tor.add_circuit_listener(self.circuit_event_listener)
+        self.circuit_event_listener = CircuitEventListener(self.tor_state)
+        self.tor_state.add_circuit_listener(self.circuit_event_listener)
 
     @defer.inlineCallbacks
     def test_circuit_lifecycle(self):
@@ -44,7 +44,7 @@ def test_circuit_lifecycle(self):
         # XXX argh, we haven't gotten all the events from Tor yet...
         # hax to block until we've made Tor do something...
         yield circ.close(ifUnused=False)
-        yield self.tor.protocol.get_info('version')
+        yield self.tor_state.protocol.get_info('version')
         expected_states = ['circuit_new', 'circuit_launched', 'circuit_extend',
                            'circuit_extend', 'circuit_extend', 'circuit_built',
                            'circuit_closed']
@@ -59,7 +59,7 @@ class TestStreamBandwidthListener(TorTestCase):
     def setUp(self):
         yield super(TestStreamBandwidthListener, self).setUp()
         self.fetch_size = 8*2**20  # 8MB
-        self.stream_bandwidth_listener = yield StreamBandwidthListener(self.tor)
+        self.stream_bandwidth_listener = yield StreamBandwidthListener(self.tor_state)
 
         class DummyResource(Resource):
             isLeaf = True
@@ -132,12 +132,12 @@ def test_circ_avg_bw(self):
     def do_fetch(self):
         time_start = time.time()
         path = self.random_path()
-        agent = OnionRoutedAgent(reactor, path=path, state=self.tor)
+        agent = OnionRoutedAgent(reactor, path=path, state=self.tor_state)
         url = "http://127.0.0.1:{}".format(self.port)
         request = yield agent.request("GET", url)
         body = yield readBody(request)
         assert len(body) == self.fetch_size
-        circ = [c for c in self.tor.circuits.values() if c.path == path][0]
+        circ = [c for c in self.tor_state.circuits.values() if c.path == path][0]
         assert isinstance(circ, Circuit)
 
         # XXX: Wait for circuit to close, then I think we can be sure that

test/test_measurement.py

@@ -36,7 +36,7 @@ def render_GET(self, request):
     def test_scan_chutney(self):
         # check that each run is producing the same input set!
         self.tmp = mkdtemp()
-        scan = BwScan(self.tor, reactor, self.tmp)
+        scan = BwScan(self.tor_state, reactor, self.tmp)
         scan.baseurl = 'http://127.0.0.1:{}'.format(self.port)
 
         def check_all_routers_measured(measurement_dir):