test_system: increase timeouts to almost 20 minutes: we have buildslaves that take...

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index 67f75ccc9185a9c07624087ceadad1c76aff911e..9215509b9ff99c11344b1a185065d57553ebc6ee 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 = 600
+    test_upload_and_download.timeout = 1100
 
     def flip_bit(self, good):
         return good[:-1] + chr(ord(good[-1]) ^ 0x01)
@@ -248,7 +248,7 @@ class SystemTest(testutil.SignalMixin, unittest.TestCase):
         d.addCallback(_get_done)
         d.addCallback(self._test_web)
         return d
-    test_vdrive.timeout = 300
+    test_vdrive.timeout = 1100
 
     def _test_web(self, res):
         base = self.webish_url