summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--oslotest/timeout.py2
-rw-r--r--releasenotes/notes/timeout-scaling-52741beadde528e5.yaml2
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.