tests: increase the default timeout for SystemTestMixin -based tests to 300 seconds...

diff --git a/src/allmydata/test/common.py b/src/allmydata/test/common.py
index 7c54b9386aef2d707e71ae43fe3444afe4ce5417..e540a2833156c4a20fb5a999200f7b38c0d76a6c 100644 (file)
--- a/src/allmydata/test/common.py
+++ b/src/allmydata/test/common.py
@@ -303,6 +303,12 @@ class LoggingServiceParent(service.MultiService):
 
 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.sparent = service.MultiService()
         self.sparent.startService()