From e83dd1259a8dae5e34d2b2334075f9d7a072d780 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 28 Dec 2012 16:55:09 -0800
Subject: Timeout individual tests after one minute.

Use fixtures.Timeout to timeout each nova test after one minute of
running. Because only one fixtures.Timeout can be in use at a time
subclasses of nova.test.TestCase should not explicitly use this fixture.

Change-Id: I0fced73e81784d0f843ecac2998598a0343a2083
---
 nova/test.py | 2 ++
 1 file changed, 2 insertions(+)

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())
 
-- 
cgit