summaryrefslogtreecommitdiffstats
path: root/nova/test.py
diff options
context:
space:
mode:
Diffstat (limited to 'nova/test.py')
-rw-r--r--nova/test.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/test.py b/nova/test.py
index 3ba38eef4..fd9c4a522 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -191,6 +191,8 @@ class TestCase(testtools.TestCase):
def setUp(self):
"""Run before each test method to initialize test environment."""
super(TestCase, self).setUp()
+ # Give each test a maximum of one minute to run.
+ self.useFixture(fixtures.Timeout(60, gentle=True))
self.useFixture(fixtures.NestedTempfile())
self.useFixture(fixtures.TempHomeDir())