diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-15 21:14:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-15 21:14:47 +0000 |
| commit | 0ee72789a81ec96460608c7c5aacc162f004b5bd (patch) | |
| tree | ce1265cb44537494d94105f7098d5eee16c3bac8 /tests | |
| parent | 14ba138863d28b083e40fb7b361f686787b9278b (diff) | |
| parent | 9378d3cf9db9b2727f401dc80682acfe1191f378 (diff) | |
| download | oslo-0ee72789a81ec96460608c7c5aacc162f004b5bd.tar.gz oslo-0ee72789a81ec96460608c7c5aacc162f004b5bd.tar.xz oslo-0ee72789a81ec96460608c7c5aacc162f004b5bd.zip | |
Merge "Move `./run_tests.sh` to Oslo"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/utils.py | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py index e93c278..f49e0af 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -38,7 +38,24 @@ class BaseTestCase(testtools.TestCase): self.conf = conf self.addCleanup(self.conf.reset) self.useFixture(fixtures.FakeLogger('openstack.common')) - self.useFixture(fixtures.Timeout(30, True)) + + test_timeout = os.environ.get('OS_TEST_TIMEOUT', 0) + try: + test_timeout = int(test_timeout) + except ValueError: + # If timeout value is invalid do not set a timeout. + test_timeout = 0 + if test_timeout > 0: + self.useFixture(fixtures.Timeout(test_timeout, gentle=True)) + if (os.environ.get('OS_STDOUT_CAPTURE') == 'True' or + os.environ.get('OS_STDOUT_CAPTURE') == '1'): + stdout = self.useFixture(fixtures.StringStream('stdout')).stream + self.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout)) + if (os.environ.get('OS_STDERR_CAPTURE') == 'True' or + os.environ.get('OS_STDERR_CAPTURE') == '1'): + stderr = self.useFixture(fixtures.StringStream('stderr')).stream + self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr)) + self.stubs.Set(exception, '_FATAL_EXCEPTION_FORMAT_ERRORS', True) self.useFixture(fixtures.NestedTempfile()) self.tempdirs = [] |