diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-02-10 16:33:04 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-02-10 16:33:04 +0000 |
commit | 71f139ea2475ba9f2685036cc826e68f01e4705d (patch) | |
tree | 193d2df81aea9da2d5148a11cebddc0370d155be | |
parent | f20e036c8934ec8249eb9732b9dbe21a8558246c (diff) | |
parent | d77b2635e6282398029194b1ba6daf3b94b3f188 (diff) | |
download | ironic-71f139ea2475ba9f2685036cc826e68f01e4705d.tar.gz |
Merge "Switch to use test_utils.call_until_true"
-rw-r--r-- | ironic_tempest_plugin/tests/scenario/baremetal_manager.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ironic_tempest_plugin/tests/scenario/baremetal_manager.py b/ironic_tempest_plugin/tests/scenario/baremetal_manager.py index 5c805a957..e7f7aae7a 100644 --- a/ironic_tempest_plugin/tests/scenario/baremetal_manager.py +++ b/ironic_tempest_plugin/tests/scenario/baremetal_manager.py @@ -16,9 +16,9 @@ from tempest.common import waiters from tempest import config +from tempest.lib.common.utils import test_utils from tempest.lib import exceptions as lib_exc from tempest.scenario import manager # noqa -import tempest.test from ironic_tempest_plugin import clients @@ -84,7 +84,7 @@ class BaremetalScenarioTest(manager.ScenarioTest): return True return False - if not tempest.test.call_until_true(check_state, timeout, interval): + if not test_utils.call_until_true(check_state, timeout, interval): msg = ("Timed out waiting for node %s to reach %s state(s) %s" % (node_id, state_attr, target_states)) raise lib_exc.TimeoutException(msg) @@ -110,7 +110,7 @@ class BaremetalScenarioTest(manager.ScenarioTest): pass return node is not None - if (not tempest.test.call_until_true( + if (not test_utils.call_until_true( _get_node, CONF.baremetal.association_timeout, 1)): msg = ('Timed out waiting to get Ironic node by instance id %s' % instance_id) |