tests: drastically increase timeout of this very time-consuming test in honor of...

diff --git a/src/allmydata/test/test_consolidate.py b/src/allmydata/test/test_consolidate.py
index 991e8bdfa9b73f4d8beb0aa03cf29dcb78b6ecdc..e02aa50e41bf06f2913e9ed4ed2aa00ad15b79b0 100644 (file)
--- a/src/allmydata/test/test_consolidate.py
+++ b/src/allmydata/test/test_consolidate.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 import os
 from cStringIO import StringIO
@@ -272,6 +273,7 @@ class Consolidate(GridTestMixin, CLITestMixin, ReallyEqualMixin, unittest.TestCa
         d.addCallback(check_consolidation)
 
         return d
+    test_basic.timeout = 28800 # It took more than 7200 seconds on François's ARM
 
     def build_manifest(self, root):
         # like dirnode.build_manifest, but this one doesn't skip duplicate