openstack
/
octavia-tempest-plugin
Code Issues Proposed changes

Merge "Fix the health monitor traffic test member ERROR"

This commit is contained in:
Zuul 2019-10-06 01:15:08 +00:00 committed by Gerrit Code Review
parent 353e74c237 8d420801d7
commit f333d21ea3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
octavia_tempest_plugin/tests/scenario/v2/test_traffic_ops.py
View File

@ -338,6 +338,7 @@ class TrafficOperationsScenarioTest(test_base.LoadBalancerBaseTestWithCompute):
const.ONLINE,
CONF.load_balancer.build_interval,
CONF.load_balancer.build_timeout,
error_ok=True,
pool_id=self.pool_id)
waiters.wait_for_status(
self.mem_member_client.show_member,

6
octavia_tempest_plugin/tests/waiters.py
View File

@ -28,7 +28,7 @@ LOG = logging.getLogger(__name__)
def wait_for_status(show_client, id, status_key, status,
check_interval, check_timeout, root_tag=None,
**kwargs):
error_ok=False, **kwargs):
"""Waits for an object to reach a specific status.
:param show_client: The tempest service client show method.
@ -40,6 +40,7 @@ def wait_for_status(show_client, id, status_key, status,
:check_interval: How often to check the status, in seconds.
:check_timeout: The maximum time, in seconds, to check the status.
:root_tag: The root tag on the response to remove, if any.
:error_ok: When true, ERROR status will not raise an exception.
:raises CommandFailed: Raised if the object goes into ERROR and ERROR was
not the desired status.
:raises TimeoutException: The object did not achieve the status or ERROR in
@ -75,7 +76,8 @@ def wait_for_status(show_client, id, status_key, status,
if caller:
message = '({caller}) {message}'.format(caller=caller,
message=message)
raise exceptions.UnexpectedResponseCode(message)
if not error_ok:
raise exceptions.UnexpectedResponseCode(message)
elif int(time.time()) - start >= check_timeout:
message = (
'{name} {field} failed to update to {expected_status} within '