diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-08 10:58:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-08 10:58:09 +0000 |
| commit | 92bfaacdfdd5fd1ae593404c541aec1692931c0e (patch) | |
| tree | 33bc97c27836df7887b3d8538b191ff4ce94c49b | |
| parent | b304f44d02f51bf1d44d6f6f2b410092aad9b51b (diff) | |
| parent | a381d7275ba4f323993b02524ef5d090d4941892 (diff) | |
| download | oslotest-92bfaacdfdd5fd1ae593404c541aec1692931c0e.tar.gz | |
Merge "Fix nits in timeout change"
| -rw-r--r-- | oslotest/timeout.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/timeout-scaling-52741beadde528e5.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oslotest/timeout.py b/oslotest/timeout.py index 69d08ad..9101f3b 100644 --- a/oslotest/timeout.py +++ b/oslotest/timeout.py @@ -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) diff --git a/releasenotes/notes/timeout-scaling-52741beadde528e5.yaml b/releasenotes/notes/timeout-scaling-52741beadde528e5.yaml index ad9f047..fcf92a1 100644 --- a/releasenotes/notes/timeout-scaling-52741beadde528e5.yaml +++ b/releasenotes/notes/timeout-scaling-52741beadde528e5.yaml @@ -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. |