[tor-commits] [stem/master] Re-enabling test_event_handling

[atagar at torproject.org]

commit ffd7274c8bc97557d4027257b958b388911cb429
Author: Damian Johnson <atagar at torproject.org>
Date:   Tue May 14 08:30:54 2013 -0700

    Re-enabling test_event_handling
    
    Oops, I confused this test with another. I bumped the timeouts on
    test_reattaching_listeners rather than this...
    
    https://gitweb.torproject.org/stem.git/commitdiff/a5f8168
    
    Re-enabling the test with similar timeouts to see if jenkins is still happy.
    However, this is definitely still code stink indicating that we need to do
    something smarter for these tests.
---
 test/integ/control/controller.py |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index f0b94a9..2f4c413 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -108,14 +108,6 @@ class TestController(unittest.TestCase):
     them. Then remove the listeners.
     """
 
-    # TODO: This test relies on the timing of BW events which has proved to
-    # be unreliable on our jenkins host (probably related to system load).
-    # This occures even with sizable sleeps so this test needs to be disabled
-    # until we can come up with a test that doesn't rely on event timing.
-
-    test.runner.skip(self, "(presently unreliable)")
-    return
-
     if test.runner.require_control(self):
       return
 
@@ -139,11 +131,11 @@ class TestController(unittest.TestCase):
       # BW events occure at the rate of one per second, so wait a bit to let
       # some accumulate.
 
-      event_notice1.wait(2)
+      event_notice1.wait(4)
       self.assertTrue(len(event_buffer1) >= 1)
       event_notice1.clear()
 
-      event_notice2.wait(2)
+      event_notice2.wait(4)
       self.assertTrue(len(event_buffer2) >= 1)
       event_notice2.clear()
 
@@ -153,10 +145,10 @@ class TestController(unittest.TestCase):
 
       buffer2_size = len(event_buffer2)
 
-      event_notice1.wait(2)
+      event_notice1.wait(4)
       self.assertTrue(len(event_buffer1) >= 2)
 
-      event_notice2.wait(2)
+      event_notice2.wait(4)
       self.assertEqual(buffer2_size, len(event_buffer2))
 
       for event in event_buffer1: