remove the custom timeouts

src/allmydata/test/cli/test_backup.py

@@ -19,7 +19,6 @@ from .common import (
     parse_options,
 )
 
-timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s
 
 def _unsupported(what):
     return "{} are not supported by Python on this platform.".format(what)
@@ -307,13 +306,6 @@ class Backup(GridTestMixin, CLITestMixin, StallMixin, unittest.TestCase):
 
         return d
 
-    # on our old dapper buildslave, this test takes a long time (usually
-    # 130s), so we have to bump up the default 120s timeout. The create-alias
-    # and initial backup alone take 60s, probably because of the handful of
-    # dirnodes being created (RSA key generation). The backup between check4
-    # and check4a takes 6s, as does the backup before check4b.
-    test_backup.timeout = 3000
-
     def _check_filtering(self, filtered, all, included, excluded):
         filtered = set(filtered)
         all = set(all)

src/allmydata/test/cli/test_check.py

@@ -12,8 +12,6 @@ from allmydata.scripts import debug
 from ..no_network import GridTestMixin
 from .common import CLITestMixin
 
-timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s
-
 class Check(GridTestMixin, CLITestMixin, unittest.TestCase):
 
     def test_check(self):

src/allmydata/test/cli/test_cli.py

@@ -43,8 +43,6 @@ from twisted.python import usage
 
 from allmydata.util.encodingutil import listdir_unicode, get_io_encoding
 
-timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s
-
 class CLI(CLITestMixin, unittest.TestCase):
     def _dump_cap(self, *args):
         config = debug.DumpCapOptions()

src/allmydata/test/cli/test_cp.py

@@ -14,8 +14,6 @@ from ..no_network import GridTestMixin
 from .common import CLITestMixin
 from ..common_util import skip_if_cannot_represent_filename
 
-timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s
-
 class Cp(GridTestMixin, CLITestMixin, unittest.TestCase):
 
     def test_not_enough_args(self):

src/allmydata/test/cli/test_create_alias.py

@@ -9,8 +9,6 @@ from ..no_network import GridTestMixin
 from allmydata.util.encodingutil import quote_output, get_io_encoding
 from .common import CLITestMixin
 
-timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s
-
 class CreateAlias(GridTestMixin, CLITestMixin, unittest.TestCase):
 
     def _test_webopen(self, args, expected_url):

src/allmydata/test/cli/test_list.py

@@ -8,8 +8,6 @@ from ..no_network import GridTestMixin
 from allmydata.util.encodingutil import quote_output, get_io_encoding
 from .common import CLITestMixin
 
-timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s
-
 class List(GridTestMixin, CLITestMixin, unittest.TestCase):
     def test_list(self):
         self.basedir = "cli/List/list"

src/allmydata/test/cli/test_mv.py

@@ -5,8 +5,6 @@ from ..no_network import GridTestMixin
 from allmydata.scripts import tahoe_mv
 from .common import CLITestMixin
 
-timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s
-
 class Mv(GridTestMixin, CLITestMixin, unittest.TestCase):
     def test_mv_behavior(self):
         self.basedir = "cli/Mv/mv_behavior"

src/allmydata/test/cli/test_put.py

@@ -11,8 +11,6 @@ from allmydata.util.encodingutil import get_io_encoding, unicode_to_argv
 from allmydata.util.fileutil import abspath_expanduser_unicode
 from .common import CLITestMixin
 
-timeout = 480 # deep_check takes 360s on Zandr's linksys box, others take > 240s
-
 class Put(GridTestMixin, CLITestMixin, unittest.TestCase):
 
     def test_unlinked_immutable_stdin(self):
@@ -471,4 +469,3 @@ class Put(GridTestMixin, CLITestMixin, unittest.TestCase):
                       self.failUnlessReallyEqual(rc_out_err[1], DATA))
 
         return d
-

src/allmydata/test/mutable/test_update.py

@@ -16,8 +16,6 @@ from .. import common_util as testutil
 SEGSIZE = 128*1024
 
 class Update(GridTestMixin, unittest.TestCase, testutil.ShouldFailMixin):
-    timeout = 400 # these tests are too big, 120s is not enough on slow
-                  # platforms
     def setUp(self):
         GridTestMixin.setUp(self)
         self.basedir = self.mktemp()

src/allmydata/test/test_checker.py

@@ -544,5 +544,3 @@ class TooParallel(GridTestMixin, unittest.TestCase):
             return res
         d.addBoth(_clean_up)
         return d
-
-    test_immutable.timeout = 80

src/allmydata/test/test_deepcheck.py

@@ -20,8 +20,6 @@ from .common_web import do_http
 from allmydata.test.no_network import GridTestMixin
 from .cli.common import CLITestMixin
 
-timeout = 2400 # One of these took 1046.091s on Zandr's ARM box.
-
 class MutableChecker(GridTestMixin, unittest.TestCase, ErrorMixin):
     def test_good(self):
         self.basedir = "deepcheck/MutableChecker/good"

src/allmydata/test/test_dirnode.py

@@ -63,7 +63,6 @@ one_nfd = u"one\u0304"
 
 class Dirnode(GridTestMixin, unittest.TestCase,
               testutil.ReallyEqualMixin, testutil.ShouldFailMixin, testutil.StallMixin, ErrorMixin):
-    timeout = 480 # It occasionally takes longer than 240 seconds on Francois's arm box.
 
     def _do_create_test(self, mdmf=False):
         c = self.g.clients[0]
@@ -1758,7 +1757,6 @@ class Dirnode2(testutil.ReallyEqualMixin, testutil.ShouldFailMixin, unittest.Tes
 
 
 class DeepStats(testutil.ReallyEqualMixin, 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")
@@ -1823,7 +1821,6 @@ class UCWEingNodeMaker(NodeMaker):
 
 
 class Deleter(GridTestMixin, testutil.ReallyEqualMixin, unittest.TestCase):
-    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

src/allmydata/test/test_download.py

@@ -194,7 +194,6 @@ class _Base(GridTestMixin, ShouldFailMixin):
         return d
 
 class DownloadTest(_Base, unittest.TestCase):
-    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()

src/allmydata/test/test_encode.py

@@ -163,7 +163,6 @@ 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
@@ -260,8 +259,6 @@ class ValidatedExtendedURIProxy(unittest.TestCase):
         return defer.DeferredList(dl)
 
 class Encode(unittest.TestCase):
-    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):
         data = make_data(datalen)

src/allmydata/test/test_helper.py

@@ -114,7 +114,6 @@ 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.tub = t = Tub()
         t.setOption("expose-remote-exception-types", False)

src/allmydata/test/test_hung_server.py

@@ -19,15 +19,6 @@ mutable_plaintext = "muta" * 10000
 
 class HungServerDownloadTest(GridTestMixin, ShouldFailMixin, PollMixin,
                              unittest.TestCase):
-    # Many of these tests take around 60 seconds on François's ARM buildslave:
-    # http://tahoe-lafs.org/buildbot/builders/FranXois%20lenny-armv5tel
-    # allmydata.test.test_hung_server.HungServerDownloadTest.test_2_good_8_broken_duplicate_share_fail
-    # once ERRORed after 197 seconds on Midnight Magic's NetBSD buildslave:
-    # http://tahoe-lafs.org/buildbot/builders/MM%20netbsd4%20i386%20warp
-    # MM's buildslave varies a lot in how long it takes to run tests.
-
-    timeout = 240
-
     def _break(self, servers):
         for (id, ss) in servers:
             self.g.break_server(id)

src/allmydata/test/test_introducer.py

@@ -715,8 +715,6 @@ class SystemTest(SystemTestMixin, AsyncTestCase):
         self.basedir = "introducer/SystemTest/system_v2_server"
         os.makedirs(self.basedir)
         return self.do_system_test()
-    test_system_v2_server.timeout = 480
-    # occasionally takes longer than 350s on "draco"
 
 class FakeRemoteReference:
     def notifyOnDisconnect(self, *args, **kwargs): pass

src/allmydata/test/test_magic_folder.py

@@ -2418,7 +2418,6 @@ class RealTest(SingleMagicFolderTestMixin, AsyncTestCase):
 class RealTestAliceBob(MagicFolderAliceBobTestMixin, AsyncTestCase):
     """This is skipped unless both Twisted and the platform support inotify."""
     inject_inotify = False
-    timeout = 15
 
     def setUp(self):
         d = super(RealTestAliceBob, self).setUp()

src/allmydata/test/test_runner.py

@@ -23,8 +23,6 @@ from ._twisted_9607 import (
     getProcessOutputAndValue,
 )
 
-timeout = 240
-
 def get_root_from_file(src):
     srcdir = os.path.dirname(os.path.dirname(os.path.normcase(os.path.realpath(src))))
 
@@ -499,9 +497,6 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
         d.addCallback(_after_stopping)
         d.addBoth(self._remove, exit_trigger_file)
         return d
-    # This test has hit a 240-second timeout on our feisty2.5 buildslave, and a 480-second timeout
-    # on Francois's Lenny-armv5tel buildslave.
-    test_introducer.timeout = 960
 
     def test_client_no_noise(self):
         self.skip_if_cannot_daemonize()

src/allmydata/test/test_sftp.py

@@ -35,8 +35,6 @@ from allmydata.test.no_network import GridTestMixin
 from allmydata.test.common import ShouldFailMixin
 from allmydata.test.common_util import ReallyEqualMixin
 
-timeout = 240
-
 class Handler(GridTestMixin, ShouldFailMixin, ReallyEqualMixin, unittest.TestCase):
     """This is a no-network unit test of the SFTPUserHandler and the abstractions it uses."""
 

src/allmydata/test/test_system.py

@@ -421,12 +421,6 @@ def _render_section_values(values):
 
 class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
 
-    # SystemTestMixin tests tend to be a lot of work, and we have a few
-    # buildslaves that are pretty slow, and every once in a while these tests
-    # run up against the default 120 second timeout. So increase the default
-    # timeout. Individual test cases can override this, of course.
-    timeout = 300
-
     def setUp(self):
         self.port_assigner = SameProcessStreamEndpointAssigner()
         self.port_assigner.setUp()
@@ -752,7 +746,6 @@ class CountingDataUploadable(upload.Data):
         return upload.Data.read(self, length)
 
 class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
-    timeout = 3600 # It takes longer than 960 seconds on Zandr's ARM box.
 
     def test_connections(self):
         self.basedir = "system/SystemTest/test_connections"

src/allmydata/test/test_upload.py

@@ -27,11 +27,6 @@ MiB = 1024*1024
 def extract_uri(results):
     return results.get_uri()
 
-# 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):
         self.failUnless(isinstance(data, list))

src/allmydata/test/test_util.py

@@ -1060,7 +1060,6 @@ class Abbreviate(unittest.TestCase):
         self.failUnlessIn("fhtagn", str(e))
 
 class Limiter(unittest.TestCase):
-    timeout = 480 # This takes longer than 240 seconds on Francois's arm box.
 
     def job(self, i, foo):
         self.calls.append( (i, foo) )

src/allmydata/test/web/test_web.py

@@ -57,8 +57,6 @@ from ..status import FakeStatus
 # create a fake uploader/downloader, and a couple of fake dirnodes, then
 # create a webserver that works against them
 
-timeout = 480 # Most of these take longer than 240 seconds on Francois's arm box.
-
 class FakeStatsProvider:
     def get_stats(self):
         stats = {'stats': {}, 'counters': {}}