Merge "Fix atomic wrapper"

This commit is contained in:
Jenkins 2017-04-21 17:28:35 +00:00 committed by Gerrit Code Review
commit 5b2ebdf7d8

View File

@ -22,8 +22,8 @@ from oslotest import base
from oslotest import mockpatch from oslotest import mockpatch
from rally.common import db from rally.common import db
from rally.common import objects
from rally import plugins from rally import plugins
from rally.task import utils as tutils
from tests.unit import fakes from tests.unit import fakes
@ -47,9 +47,8 @@ class TestCase(base.BaseTestCase):
plugins.load() plugins.load()
def _test_atomic_action_timer(self, atomic_actions, name): def _test_atomic_action_timer(self, atomic_actions, name):
_old_atomic_actions = objects.Task.convert_atomic_actions( atomic_wrapper = tutils.WrapperForAtomicActions(atomic_actions)
atomic_actions) action_duration = atomic_wrapper.get(name)
action_duration = _old_atomic_actions.get(name)
self.assertIsNotNone(action_duration) self.assertIsNotNone(action_duration)
self.assertIsInstance(action_duration, float) self.assertIsInstance(action_duration, float)