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 0b7b271429049fec59f2184228fbe1b6735e229e..1e9abb23475cc975eeb15f44ab892cdd01277b24 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 = 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 50c3514bc4be75e11060dcc8c456cfbbebe335a5..487ba0a17875140d4d9878938111946cbdea94b5 100644 (file)
--- 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):