tests: bump up the timeout on a bunch of tests that took longer than the default...

diff --git a/src/allmydata/test/test_deepcheck.py b/src/allmydata/test/test_deepcheck.py
index 9df0c7cc54ccf53a41a1d6daef477b90f7214e1c..c6617c14655d8ab4fdc20c559b81af4b0b02921e 100644 (file)
--- a/src/allmydata/test/test_deepcheck.py
+++ b/src/allmydata/test/test_deepcheck.py
@@ -21,6 +21,7 @@ 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.
 
     def _run_cli(self, argv):
         stdout, stderr = StringIO(), StringIO()
@@ -831,6 +832,7 @@ 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"
@@ -1159,6 +1161,7 @@ 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 656d890330b1c31b213948302046f7e99d882551..53ab4ef720abc2ed7d61e55947bd0596a235b0cc 100644 (file)
--- a/src/allmydata/test/test_dirnode.py
+++ b/src/allmydata/test/test_dirnode.py
@@ -92,6 +92,7 @@ class FakeClient:
 
 class Dirnode(unittest.TestCase,
               testutil.ShouldFailMixin, testutil.StallMixin, ErrorMixin):
+    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
     def setUp(self):
         self.client = FakeClient()
 
@@ -713,6 +714,7 @@ class Dirnode(unittest.TestCase,
         return d
 
 class DeepStats(unittest.TestCase):
+    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
     def test_stats(self):
         ds = dirnode.DeepStats(None)
         ds.add("count-files")
@@ -772,6 +774,7 @@ class UCWEingNewDirectoryNode(dirnode.NewDirectoryNode):
 
 
 class Deleter(GridTestMixin, unittest.TestCase):
+    timeout = 240 # It takes longer than 120 seconds on Francois'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 998cea5413a15386429eaec5b94affb16d735926..042105e26e55b96bb293e69566507e0adbebc8f9 100644 (file)
--- a/src/allmydata/test/test_download.py
+++ b/src/allmydata/test/test_download.py
@@ -68,6 +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.
     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 b3461f357ccd4be1ebaa51eae18c94947ed8e60a..62b4ecfc80746359a6d7cae313fb498a1e42a555 100644 (file)
--- a/src/allmydata/test/test_encode.py
+++ b/src/allmydata/test/test_encode.py
@@ -174,6 +174,7 @@ def make_data(length):
     return data[:length]
 
 class ValidatedExtendedURIProxy(unittest.TestCase):
+    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
     K = 4
     M = 10
     SIZE = 200
@@ -270,6 +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.
 
     def do_encode(self, max_segment_size, datalen, NUM_SHARES, NUM_SEGMENTS,
                   expected_block_hashes, expected_share_hashes):
@@ -416,6 +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.
     def send_and_recover(self, k_and_happy_and_n=(25,75,100),
                          AVAILABLE_SHARES=None,
                          datalen=76,

diff --git a/src/allmydata/test/test_helper.py b/src/allmydata/test/test_helper.py
index 38ce5eee857b182d6361eabd1c07dbb5d5f57b5e..d2e689c0b6ed69eb1accce5e45c0d15c33c3389f 100644 (file)
--- a/src/allmydata/test/test_helper.py
+++ b/src/allmydata/test/test_helper.py
@@ -92,6 +92,7 @@ def upload_data(uploader, data, convergence):
     return uploader.upload(u)
 
 class AssistedUpload(unittest.TestCase):
+    timeout = 240 # It takes longer than 120 seconds on Francois's arm box.
     def setUp(self):
         self.s = FakeClient()
         self.s.startService()