summaryrefslogtreecommitdiff
path: root/taskflow/tests/unit/worker_based
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-15 22:02:39 +0000
committerGerrit Code Review <review@openstack.org>2015-07-15 22:02:39 +0000
commit78ac726b0df7a784bc6fdf22c219a25cadc0e679 (patch)
treeef76c84f84576c3a733f026157345e101ee2da80 /taskflow/tests/unit/worker_based
parent6633e7a3665cfdd9ee509a4206ab978c26420f54 (diff)
parent33818cd483e36a8348ef935107967fffb1a4a017 (diff)
downloadtaskflow-78ac726b0df7a784bc6fdf22c219a25cadc0e679.tar.gz
Merge "Remove direct usage of timeutils overrides and use fixture"
Diffstat (limited to 'taskflow/tests/unit/worker_based')
-rw-r--r--taskflow/tests/unit/worker_based/test_executor.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/taskflow/tests/unit/worker_based/test_executor.py b/taskflow/tests/unit/worker_based/test_executor.py
index e6c21eb..504433d 100644
--- a/taskflow/tests/unit/worker_based/test_executor.py
+++ b/taskflow/tests/unit/worker_based/test_executor.py
@@ -18,6 +18,7 @@ import threading
import time
import futurist
+from oslo_utils import fixture
from oslo_utils import timeutils
from taskflow.engines.worker_based import executor
@@ -184,12 +185,12 @@ class TestWorkerTaskExecutor(test.MockTestCase):
def test_on_wait_task_expired(self):
now = timeutils.utcnow()
+ f = self.useFixture(fixture.TimeFixture(override_time=now))
+
self.request_inst_mock.expired = True
self.request_inst_mock.created_on = now
- timeutils.set_time_override(now)
- self.addCleanup(timeutils.clear_time_override)
- timeutils.advance_time_seconds(120)
+ f.advance_time_seconds(120)
ex = self.executor()
ex._requests_cache[self.task_uuid] = self.request_inst_mock