From 6ae8ae47fe88ed4c62af50dc8fe982a38cef95a9 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Tue, 15 Mar 2022 12:23:14 -0300 Subject: [PATCH] Fix Octavia wait_for_lb_resource() This change drops the use of AssertionError in favor of LoadBalancerUnexpectedState that was introduced by commit acaeb62 which stopped retrying on AssertionError. --- zaza/openstack/charm_tests/octavia/tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zaza/openstack/charm_tests/octavia/tests.py b/zaza/openstack/charm_tests/octavia/tests.py index 5996b6c..086932b 100644 --- a/zaza/openstack/charm_tests/octavia/tests.py +++ b/zaza/openstack/charm_tests/octavia/tests.py @@ -302,8 +302,9 @@ class LBAASv2Test(test_utils.OpenStackBaseTest): # retrying and delaying the failure. if resp['provisioning_status'] == 'ERROR': raise LoadBalancerUnrecoverableError(msg) + elif resp['provisioning_status'] != provisioning_status: + raise LoadBalancerUnexpectedState(msg) - assert resp['provisioning_status'] == provisioning_status, msg if operating_status: logging.info('Current operating status: {}, waiting for {}' .format(resp['operating_status'], operating_status))