commit 4e2473d98c88399d1fd00e4c92ae215c092188b7 Author: Damian Johnson atagar@torproject.org Date: Sat Dec 6 16:52:14 2014 -0800

Descriptor integ tests require a connection

Oops, these tests should require a connection. This one was easy to repro by simply disconnecting. --- test/integ/control/controller.py | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index cc4d12c..adaaf8d 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