openstack
/
neutron-lbaas
Code Issues Proposed changes

Use call_until_true from tempest.test 

Under stable/newton the upper-constraints file restricts tempest to 12.1.0
which does not have call_until_true moved to the new location in test_utils.
This patch moves the calls to call_until_true back to it's previous location
on the stable/newton branch.  Tempest release notes say it is still valid
at that location until Ocata[1].

[1] https://docs.openstack.org/releasenotes/tempest/v13.0.0.html

Change-Id: I856e681c764878c45ee56adcf6ccab7de900394b
This commit is contained in:
Michael Johnson 2017-05-12 14:01:57 -07:00
parent b93597dacf
commit bc1fb460d5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neutron_lbaas/tests/tempest/v2/scenario/manager.py
View File

@ -556,7 +556,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
'should_succeed':
'reachable' if should_succeed else 'unreachable'
})
result = test_utils.call_until_true(ping, timeout, 1)
result = tempest.test.call_until_true(ping, timeout, 1)
LOG.debug('%(caller)s finishes ping %(ip)s in %(timeout)s sec and the '
'ping result is %(result)s', {
'caller': caller, 'ip': ip_address, 'timeout': timeout,
@ -887,9 +887,9 @@ class NetworkScenarioTest(ScenarioTest):
show_floatingip(floatingip_id)['floatingip'])
return status == result['status']
test_utils.call_until_true(refresh,
CONF.network.build_timeout,
CONF.network.build_interval)
tempest.test.call_until_true(refresh,
CONF.network.build_timeout,
CONF.network.build_interval)
floating_ip = self.floating_ips_client.show_floatingip(
floatingip_id)['floatingip']
self.assertEqual(status, floating_ip['status'],
@ -944,9 +944,9 @@ class NetworkScenarioTest(ScenarioTest):
return not should_succeed
return should_succeed
return test_utils.call_until_true(ping_remote,
CONF.validation.ping_timeout,
1)
return tempest.test.call_until_true(ping_remote,
CONF.validation.ping_timeout,
1)
def _create_security_group(self, security_group_rules_client=None,
tenant_id=None,