From: Brian Warner <warner@lothar.com>
Date: Fri, 9 Mar 2007 00:30:09 +0000 (-0700)
Subject: test_system.py: remove the lowered (20s) timeouts, since some buildslaves require... 
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/simplejson/cyclelanguage?a=commitdiff_plain;h=e08308e019624d5e8a65ed7904c7a173457fce0f;p=tahoe-lafs%2Ftahoe-lafs.git

test_system.py: remove the lowered (20s) timeouts, since some buildslaves require more like 30 or 40 seconds to complete the test
---

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index 0ec50774..62111b9c 100644
--- a/src/allmydata/test/test_system.py
+++ b/src/allmydata/test/test_system.py
@@ -110,7 +110,6 @@ class SystemTest(unittest.TestCase):
             return d1
         d.addBoth(_shutdown_extra_node)
         return d
-    test_connections.timeout = 20
 
     def test_upload_and_download(self):
         DATA = "Some data to upload\n"
@@ -132,7 +131,6 @@ class SystemTest(unittest.TestCase):
             self.failUnlessEqual(data, DATA)
         d.addCallback(_download_done)
         return d
-    test_upload_and_download.timeout = 20
 
     def test_vdrive(self):
         self.data = DATA = "Some data to publish to the virtual drive\n"
@@ -157,7 +155,6 @@ class SystemTest(unittest.TestCase):
         d.addCallback(_get_done)
         d.addCallback(self._test_web)
         return d
-    test_vdrive.timeout = 20
 
     def _test_web(self, res):
         base = self.webish_url