diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-05 06:13:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-05 06:13:12 +0000 |
| commit | c9873ff654265761ca3eab1df3e65a3f9963ae18 (patch) | |
| tree | f53441b01a17ea89bf3632474526f75c5cbd87e4 | |
| parent | f47c997242f591ca45945f86c00b584217a9b75b (diff) | |
| parent | e83dd1259a8dae5e34d2b2334075f9d7a072d780 (diff) | |
| download | nova-c9873ff654265761ca3eab1df3e65a3f9963ae18.tar.gz nova-c9873ff654265761ca3eab1df3e65a3f9963ae18.tar.xz nova-c9873ff654265761ca3eab1df3e65a3f9963ae18.zip | |
Merge "Timeout individual tests after one minute."
| -rw-r--r-- | nova/test.py | 2 |
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()) |