commit 19d9a1ccde704ea05bd8e4b4231820a0b28df974 Author: Damian Johnson atagar@torproject.org Date: Sat Jan 5 20:35:31 2013 -0800

Fixing test_reattaching_listeners when there's authentication

The test_reattaching_listeners wasn't making any effort to authenticate connections, causing the test to break for every integ target except RUN_NONE and RUN_OPEN (the later being the default which is why this went undiscovered so long). Oops. --- test/integ/control/controller.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index b212300..22d06be 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -146,7 +146,7 @@ class TestController(unittest.TestCase): # reconnect and check that we get events again

controller.connect() - controller.authenticate() + controller.authenticate(password = test.runner.CONTROL_PASSWORD)

event_notice.wait(2) self.assertTrue(len(event_buffer) >= 1) @@ -160,7 +160,7 @@ class TestController(unittest.TestCase): # reconnect and check that we get events again

controller.connect() - stem.connection.authenticate(controller) + controller.authenticate(password = test.runner.CONTROL_PASSWORD)

event_notice.wait(2) self.assertTrue(len(event_buffer) >= 1) @@ -174,7 +174,7 @@ class TestController(unittest.TestCase): # reconnect and check that we get events again

controller.connect() - controller.msg("AUTHENTICATE") + controller.authenticate(password = test.runner.CONTROL_PASSWORD)

event_notice.wait(2) self.assertTrue(len(event_buffer) >= 1)