summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamian Johnson <atagar@torproject.org>2014-12-06 16:52:14 -0800
committerDamian Johnson <atagar@torproject.org>2014-12-06 16:52:14 -0800
commit4e2473d98c88399d1fd00e4c92ae215c092188b7 (patch)
tree9e7d199825c02f154196dc8ba106e858753484a1
parent2ee4e95ab0f2640674c1074ce26e2f09ce9bdf26 (diff)
Descriptor integ tests require a connection
Oops, these tests should require a connection. This one was easy to repro by simply disconnecting.
-rw-r--r--test/integ/control/controller.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index cc4d12c8..adaaf8d1 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -996,6 +996,8 @@ class TestController(unittest.TestCase):
return
elif test.runner.require_version(self, Requirement.MICRODESCRIPTOR_IS_DEFAULT):
return
+ elif test.runner.require_online(self):
+ return
with test.runner.get_runner().get_tor_controller() as controller:
# we should balk at invalid content
@@ -1103,6 +1105,8 @@ class TestController(unittest.TestCase):
if test.runner.require_control(self):
return
+ elif test.runner.require_online(self):
+ return
with test.runner.get_runner().get_tor_controller() as controller:
# we should balk at invalid content
@@ -1130,6 +1134,8 @@ class TestController(unittest.TestCase):
if test.runner.require_control(self):
return
+ elif test.runner.require_online(self):
+ return
with runner.get_tor_controller() as controller:
count = 0