update timeouts for upgrade tests

buildbot · Oct 17, 2013 · 1a44939 · 1a44939
1 parent 9571c89
commit 1a44939
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/master/buildbot/test/util/change_import.py b/master/buildbot/test/util/change_import.py
@@ -31,6 +31,11 @@ class ChangeImportMixin(db.RealDatabaseMixin):
     This is a subclass of RealDatabaseMixin, so do not inherit from that class
     separately!
     """
+
+    # on postgres, at least, many of these tests can take longer than the default
+    # 120s (!!)
+    timeout = 240
+
     def make_pickle(self, *changes, **kwargs):
         recode_fn = kwargs.pop('recode_fn', None)
         # this uses the now-defunct ChangeMaster, which exists only in the