tests: double the timeouts on some tests which time-out on Francois's box

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index d85344c786e757d110c35ad9a18df8aeae189143..0b7b271429049fec59f2184228fbe1b6735e229e 100644 (file)
--- a/src/allmydata/test/test_system.py
+++ b/src/allmydata/test/test_system.py
@@ -63,7 +63,7 @@ class GrabEverythingConsumer:
         pass
 
 class SystemTest(SystemTestMixin, unittest.TestCase):
-    timeout = 480 # It takes longer than 240 seconds on Francois's arm box.
+    timeout = 960 # It takes longer than 480 seconds on Francois's arm box.
 
     def test_connections(self):
         self.basedir = "system/SystemTest/test_connections"

diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py
index bea4ebdbc7ba16c7aca39594b2d0b55b0412a0d3..50c3514bc4be75e11060dcc8c456cfbbebe335a5 100644 (file)
--- a/src/allmydata/test/test_upload.py
+++ b/src/allmydata/test/test_upload.py
@@ -22,7 +22,7 @@ MiB = 1024*1024
 def extract_uri(results):
     return results.uri
 
-timeout = 240 # Most of these take longer than 120 seconds on Francois's arm box.
+timeout = 480 # Some of these take longer than 240 seconds on Francois's arm box.
 
 class Uploadable(unittest.TestCase):
     def shouldEqual(self, data, expected):

diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py
index 68aca072cc953a5c2b3070676d3e5bc0097c56db..ca64b1f4c5ed322749c1e216b18fc6f659fdecdf 100644 (file)
--- a/src/allmydata/test/test_util.py
+++ b/src/allmydata/test/test_util.py
@@ -689,7 +689,7 @@ class Abbreviate(unittest.TestCase):
         self.failUnless("12 cubits" in str(e))
 
 class Limiter(unittest.TestCase):
-    timeout = 240 # This takes longer than 120 seconds on Francois's arm box.
+    timeout = 480 # This takes longer than 240 seconds on Francois's arm box.
 
     def job(self, i, foo):
         self.calls.append( (i, foo) )

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 60e31b309049c679965e2aa1550e51ce9d74bfba..846c29b424886385165170f4e179afa4d09cff9d 100644 (file)
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -29,7 +29,7 @@ from allmydata.test.common_web import HTTPClientGETFactory, \
 # create a fake uploader/downloader, and a couple of fake dirnodes, then
 # create a webserver that works against them
 
-timeout = 240 # Most of these take longer than 120 seconds on Francois's arm box.
+timeout = 480 # Most of these take longer than 240 seconds on Francois's arm box.
 
 class FakeIntroducerClient:
     def get_all_connectors(self):