test: multiple by 10 or so all timeouts that Zandr's ARM box just overran

diff --git a/src/allmydata/test/test_deepcheck.py b/src/allmydata/test/test_deepcheck.py
index c6617c14655d8ab4fdc20c559b81af4b0b02921e..0731c383da55fe4fc20bb37d281b450b4b54b4a8 100644 (file)
--- a/src/allmydata/test/test_deepcheck.py
+++ b/src/allmydata/test/test_deepcheck.py
@@ -20,9 +20,9 @@ from allmydata.test.common import ErrorMixin, _corrupt_mutable_share_data, \
 from allmydata.test.common_util import StallMixin
 from allmydata.test.no_network import GridTestMixin
 
-class MutableChecker(GridTestMixin, unittest.TestCase, ErrorMixin):
-    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
+timeout = 960 # Most of these take longer than 340 seconds on Zand's ARM box.
 
+class MutableChecker(GridTestMixin, unittest.TestCase, ErrorMixin):
     def _run_cli(self, argv):
         stdout, stderr = StringIO(), StringIO()
         # this can only do synchronous operations
@@ -832,8 +832,6 @@ class DeepCheckWebGood(DeepCheckBase, unittest.TestCase):
 
 
 class DeepCheckWebBad(DeepCheckBase, unittest.TestCase):
-    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
-
     def test_bad(self):
         self.basedir = "deepcheck/DeepCheckWebBad/bad"
         self.set_up_grid()
@@ -1161,7 +1159,6 @@ class DeepCheckWebBad(DeepCheckBase, unittest.TestCase):
         return d
 
 class Large(DeepCheckBase, unittest.TestCase):
-    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
     def test_lots_of_lits(self):
         self.basedir = "deepcheck/Large/lots_of_lits"
         self.set_up_grid()

diff --git a/src/allmydata/test/test_dirnode.py b/src/allmydata/test/test_dirnode.py
index 53ab4ef720abc2ed7d61e55947bd0596a235b0cc..45567198ce07bf6d5aec3539dfe54151bee248ae 100644 (file)
--- a/src/allmydata/test/test_dirnode.py
+++ b/src/allmydata/test/test_dirnode.py
@@ -774,7 +774,7 @@ class UCWEingNewDirectoryNode(dirnode.NewDirectoryNode):
 
 
 class Deleter(GridTestMixin, unittest.TestCase):
-    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
+    timeout = 3600 # It takes longer than 433 seconds on Zandr's ARM box.
     def test_retry(self):
         # ticket #550, a dirnode.delete which experiences an
         # UncoordinatedWriteError will fail with an incorrect "you're

diff --git a/src/allmydata/test/test_download.py b/src/allmydata/test/test_download.py
index 042105e26e55b96bb293e69566507e0adbebc8f9..a4743d2eb6c62a8e3038d850342007d68da80c91 100644 (file)
--- a/src/allmydata/test/test_download.py
+++ b/src/allmydata/test/test_download.py
@@ -68,7 +68,7 @@ mutable_shares = {
 #--------- END stored_shares.py ----------------
 
 class DownloadTest(GridTestMixin, unittest.TestCase):
-    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
+    timeout = 2400 # It takes longer than 240 seconds on Zandr's ARM box.
     def test_download(self):
         self.basedir = self.mktemp()
         self.set_up_grid()

diff --git a/src/allmydata/test/test_encode.py b/src/allmydata/test/test_encode.py
index 62b4ecfc80746359a6d7cae313fb498a1e42a555..6e8ba069d66135ff8c2946efa9eda48d7fe4ec43 100644 (file)
--- a/src/allmydata/test/test_encode.py
+++ b/src/allmydata/test/test_encode.py
@@ -271,7 +271,7 @@ class ValidatedExtendedURIProxy(unittest.TestCase):
         return defer.DeferredList(dl)
 
 class Encode(unittest.TestCase):
-    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
+    timeout = 2400 # It takes longer than 240 seconds on Zandr's ARM box.
 
     def do_encode(self, max_segment_size, datalen, NUM_SHARES, NUM_SEGMENTS,
                   expected_block_hashes, expected_share_hashes):
@@ -418,7 +418,7 @@ class StoppingTarget(PausingTarget):
         self.producer.stopProducing()
 
 class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin):
-    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
+    timeout = 2400 # It takes longer than 240 seconds on Zandr's ARM box.
     def send_and_recover(self, k_and_happy_and_n=(25,75,100),
                          AVAILABLE_SHARES=None,
                          datalen=76,