openstack
/
oslotest
Code Issues Proposed changes

Merge "Fix nits in timeout change"

This commit is contained in:
Zuul 2018-10-08 10:58:09 +00:00 committed by Gerrit Code Review
parent b304f44d02 a381d7275b
commit 92bfaacdfd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oslotest/timeout.py
View File

@ -37,7 +37,7 @@ class Timeout(fixtures.Fixture):
try:
test_timeout = int(test_timeout)
except ValueError:
# If timeout value is invalid do not set a timeout.
# If timeout value is invalid use the default timeout.
test_timeout = self._default_timeout
try:
scaled_timeout = int(test_timeout * self._scaling_factor)

2
releasenotes/notes/timeout-scaling-52741beadde528e5.yaml
View File

@ -5,6 +5,6 @@ features:
modifying a test class to have a longer timeout than other tests in the
suite without having to raise the default timeout for all tests.
- |
New class varable, ``DEFAULT_TIMEOUT`` was added that lets test suite
New class variable, ``DEFAULT_TIMEOUT`` was added that lets test suite
authors override the default value of ``OS_TEST_TIMEOUT`` at the
test suite level.