Merge "Fix nits in timeout change"
This commit is contained in:
commit
92bfaacdfd
|
@ -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)
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue