From: Brian Warner <warner@allmydata.com>
Date: Tue, 5 Feb 2008 23:37:58 +0000 (-0700)
Subject: test_introducer.py: increase timeouts on poll() calls
X-Git-Tag: allmydata-tahoe-0.8.0~149
X-Git-Url: https://git.rkrishnan.org/simplejson/frontends/webapi.txt?a=commitdiff_plain;h=a7ea39e626173ffa689dd9920dc1aff2bbcc25b7;p=tahoe-lafs%2Ftahoe-lafs.git

test_introducer.py: increase timeouts on poll() calls
---

diff --git a/src/allmydata/test/test_introducer.py b/src/allmydata/test/test_introducer.py
index 5f154b4b..f70e0739 100644
--- a/src/allmydata/test/test_introducer.py
+++ b/src/allmydata/test/test_introducer.py
@@ -122,7 +122,7 @@ class TestIntroducer(unittest.TestCase, testutil.PollMixin):
                 if len(c.get_all_connections()) < NUMCLIENTS:
                     return False
             return True
-        d = self.poll(_wait_for_all_connections, timeout=5)
+        d = self.poll(_wait_for_all_connections)
 
         def _check1(res):
             log.msg("doing _check1")
@@ -148,12 +148,12 @@ class TestIntroducer(unittest.TestCase, testutil.PollMixin):
             # noticing the loss
             def _compare():
                 return current_counter != origin_c.counter
-            return self.poll(_compare, timeout=5)
+            return self.poll(_compare)
 
         d.addCallback(_disconnect_somebody_else)
 
         # and wait for them to reconnect
-        d.addCallback(lambda res: self.poll(_wait_for_all_connections, timeout=5))
+        d.addCallback(lambda res: self.poll(_wait_for_all_connections))
         def _check2(res):
             log.msg("doing _check2")
             for c in clients:
@@ -171,10 +171,10 @@ class TestIntroducer(unittest.TestCase, testutil.PollMixin):
 
             def _compare():
                 return current_counter != origin_c.counter
-            return self.poll(_compare, timeout=5)
+            return self.poll(_compare)
         d.addCallback(_disconnect_yourself)
 
-        d.addCallback(lambda res: self.poll(_wait_for_all_connections, timeout=5))
+        d.addCallback(lambda res: self.poll(_wait_for_all_connections))
         def _check3(res):
             log.msg("doing _check3")
             for c in clients:
@@ -194,7 +194,7 @@ class TestIntroducer(unittest.TestCase, testutil.PollMixin):
                 if c.connected_to_introducer():
                     return False
             return True
-        d.addCallback(lambda res: self.poll(_wait_for_introducer_loss, timeout=5))
+        d.addCallback(lambda res: self.poll(_wait_for_introducer_loss))
 
         def _check4(res):
             log.msg("doing _check4")