From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Wed, 10 Jun 2009 16:10:43 +0000 (-0700)
Subject: tests: significantly increase timeouts that triggered on Zandr's ARM box
X-Git-Tag: trac-4000~91
X-Git-Url: https://git.rkrishnan.org/simplejson/components/com_hotproperty/status?a=commitdiff_plain;h=0ed65fba347fb9cc2b3b9fcfc74e7c7e0f1d1d29;p=tahoe-lafs%2Ftahoe-lafs.git

tests: significantly increase timeouts that triggered on Zandr's ARM box
---

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index 0b7b2714..1e9abb23 100644
--- 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 = 960 # It takes longer than 480 seconds on Francois's arm box.
+    timeout = 3600 # It takes longer than 960 seconds on Zandr'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 50c3514b..487ba0a1 100644
--- a/src/allmydata/test/test_upload.py
+++ b/src/allmydata/test/test_upload.py
@@ -22,7 +22,10 @@ MiB = 1024*1024
 def extract_uri(results):
     return results.uri
 
-timeout = 480 # Some of these take longer than 240 seconds on Francois's arm box.
+# Some of these took longer than 480 seconds on Zandr's arm box, but this may
+# have been due to an earlier test ERROR'ing out due to timeout, which seems
+# to screw up subsequent tests.
+timeout = 960
 
 class Uploadable(unittest.TestCase):
     def shouldEqual(self, data, expected):