From faade8b20af46a221002ef25c72a1c1d430f827b Mon Sep 17 00:00:00 2001
From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 7 Jun 2010 04:59:29 -0700
Subject: [PATCH] =?UTF-8?q?tests:=20drastically=20increase=20timeout=20of?=
 =?UTF-8?q?=20this=20very=20time-consuming=20test=20in=20honor=20of=20Fran?=
 =?UTF-8?q?=C3=A7ois's=20ARM=20box?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/allmydata/test/test_consolidate.py | 2 ++
 1 file changed, 2 insertions(+)

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