diff options
| author | Clark Boylan <clark.boylan@gmail.com> | 2012-12-28 16:55:09 -0800 |
|---|---|---|
| committer | Clark Boylan <clark.boylan@gmail.com> | 2013-01-04 13:36:32 -0800 |
| commit | e83dd1259a8dae5e34d2b2334075f9d7a072d780 (patch) | |
| tree | 9822d6851d9b1de12fa49dcaac82633af283dca1 | |
| parent | 48487f1a4b8f8fa538f90716e293ac8d67853311 (diff) | |
| download | nova-e83dd1259a8dae5e34d2b2334075f9d7a072d780.tar.gz nova-e83dd1259a8dae5e34d2b2334075f9d7a072d780.tar.xz nova-e83dd1259a8dae5e34d2b2334075f9d7a072d780.zip | |
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
| -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()) |