From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 7 Jun 2010 11:59:29 +0000 (-0700)
Subject: tests: drastically increase timeout of this very time-consuming test in honor of... 
X-Git-Url: https://git.rkrishnan.org/Site/Content/Exhibitors/module-simplejson.tests.html?a=commitdiff_plain;h=faade8b20af46a221002ef25c72a1c1d430f827b;p=tahoe-lafs%2Ftahoe-lafs.git

tests: drastically increase timeout of this very time-consuming test in honor of François's ARM box
---

diff --git a/src/allmydata/test/test_consolidate.py b/src/allmydata/test/test_consolidate.py
index 991e8bdf..e02aa50e 100644
--- 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