[tor-commits] [stem/master] Skipping repurpose_circuit() test if offline

atagar at torproject.org atagar at torproject.org
Tue Aug 28 17:18:29 UTC 2012


commit d97a0c30002062ac0fbc45b32c2be6061cc35594
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Aug 27 11:08:10 2012 -0700

    Skipping repurpose_circuit() test if offline
    
    The repurpose_circuit() test uses 'GETINFO circuit-status' results which are
    empty when offline, causing an error...
    
    ======================================================================
    ERROR: test_repurpose_circuit
    ----------------------------------------------------------------------
    Traceback:
      File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 386, in test_repurpose_circuit
        first_circ = controller.get_info('circuit-status').splitlines()[0].split()
    IndexError: list index out of range
    
    ----------------------------------------------------------------------
    Ran 14 tests in 1.390s
---
 test/integ/control/controller.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index 5a078c0..5f5113c 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -383,7 +383,13 @@ class TestController(unittest.TestCase):
     runner = test.runner.get_runner()
     
     with runner.get_tor_controller() as controller:
-      first_circ = controller.get_info('circuit-status').splitlines()[0].split()
+      circuit_output = controller.get_info('circuit-status')
+      
+      # the circuit-status results will be empty if we don't have a connection
+      if circuit_output == '':
+        if test.runner.require_online(self): return
+      
+      first_circ = circuit_output.splitlines()[0].split()
       circ_id = int(first_circ[0])
       purpose = "CONTROLLER"
       if "PURPOSE=CONTROLLER" in first_circ:





More information about the tor-commits mailing list