From da3463cb94ded5c8197c93d0b2de10b979c3124b Mon Sep 17 00:00:00 2001 From: Peter Sabaini Date: Wed, 17 Apr 2024 16:38:39 +0200 Subject: [PATCH] Fix: ceph-radosgw test should only check radosgw app Don't block on global app state waiting but only check the SUT app state. --- zaza/openstack/charm_tests/ceph/tests.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/zaza/openstack/charm_tests/ceph/tests.py b/zaza/openstack/charm_tests/ceph/tests.py index 9e6f327b1..0beac49e6 100644 --- a/zaza/openstack/charm_tests/ceph/tests.py +++ b/zaza/openstack/charm_tests/ceph/tests.py @@ -1236,17 +1236,11 @@ def test_005_virtual_hosted_bucket(self): # 0. Configure virtual hosted bucket self.enable_virtual_hosted_bucket() - assert_state = { - self.primary_rgw_app: { - "workload-status": "blocked", - "workload-status-message-prefix": - "os-public-hostname must have a value " - "when virtual hosted bucket is enabled" - } - } - zaza_model.wait_for_application_states(self.model_name, - states=assert_state, - timeout=900) + zaza_model.block_until_wl_status_info_starts_with( + self.primary_rgw_app, + 'os-public-hostname must have a value', + timeout=900 + ) self.set_os_public_hostname() zaza_model.block_until_all_units_idle(self.model_name) container_name = 'zaza-bucket'