bump some unit tests up to very high timeouts because my poor G4 867 MHz PowerBook...

diff --git a/src/allmydata/test/test_introducer.py b/src/allmydata/test/test_introducer.py
index a0da3e559422a26f7025b3b88c504c705161d723..93347c5e52a0c7d7f2008cb969e3bdca7f9466a6 100644 (file)
--- a/src/allmydata/test/test_introducer.py
+++ b/src/allmydata/test/test_introducer.py
@@ -143,6 +143,7 @@ class TestIntroducer(unittest.TestCase):
             # now disconnect somebody's connection to themselves
         d.addCallback(_check_again2)
         return d
+    test_system.timeout = 1200
 
     def stall(self, res, timeout):
         d = defer.Deferred()

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index 9215509b9ff99c11344b1a185065d57553ebc6ee..4cfdc453619885da0751a25f183cb99716c5b554 100644 (file)
--- a/src/allmydata/test/test_system.py
+++ b/src/allmydata/test/test_system.py
@@ -204,7 +204,7 @@ class SystemTest(testutil.SignalMixin, unittest.TestCase):
             return d1
         d.addCallback(_download_nonexistent_uri)
         return d
-    test_upload_and_download.timeout = 1100
+    test_upload_and_download.timeout = 2400
 
     def flip_bit(self, good):
         return good[:-1] + chr(ord(good[-1]) ^ 0x01)

diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py
index 91dbef17d1247f72f8fb14cff51adebd032b53e9..383462ae3f1c551e15a88884fa9de23fa492d644 100644 (file)
--- a/src/allmydata/test/test_upload.py
+++ b/src/allmydata/test/test_upload.py
@@ -38,12 +38,14 @@ class GoodServer(unittest.TestCase):
         d = self.u.upload_data(data)
         d.addCallback(self._check)
         return d
+    testData.timeout = 300
 
     def testFileHandle(self):
         data = "This is some data to upload"
         d = self.u.upload_filehandle(StringIO(data))
         d.addCallback(self._check)
         return d
+    testFileHandle.timeout = 300
 
     def testFilename(self):
         fn = "Uploader-testFilename.data"
@@ -54,6 +56,7 @@ class GoodServer(unittest.TestCase):
         d = self.u.upload_filename(fn)
         d.addCallback(self._check)
         return d
+    testFilename.test = 300
 
 class FullServer(unittest.TestCase):
     def setUp(self):