From dd92f32c3a47185800e148001bceefc74464f687 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Sat, 19 Nov 2011 20:35:48 -0800
Subject: [PATCH] buildbot: Set timeout to 3600 seconds for acceptance tests

---
 test/buildbot/buildbot_config/master/buildsteps.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/buildbot/buildbot_config/master/buildsteps.py b/test/buildbot/buildbot_config/master/buildsteps.py
index d8a40dab5..962c4387a 100644
--- a/test/buildbot/buildbot_config/master/buildsteps.py
+++ b/test/buildbot/buildbot_config/master/buildsteps.py
@@ -96,4 +96,5 @@ class AcceptanceTests(ShellCommand):
         # Make sure that the proper environment variables for the test
         # get passed through to the slave
         kwargs["env"] = { "ACCEPTANCE_CONFIG": WithProperties("%(acceptance_config_path)s") }
+        kwargs["timeout"] = 3600
         ShellCommand.__init__(self, **kwargs)