From 9bdaf703d22190de4b226e04fbb93fe6a2f6afc6 Mon Sep 17 00:00:00 2001 From: Shunde Zhang Date: Wed, 3 Apr 2024 15:38:05 +1100 Subject: [PATCH] skip virtual hosted bucket test after multi site tests --- zaza/openstack/charm_tests/ceph/tests.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/zaza/openstack/charm_tests/ceph/tests.py b/zaza/openstack/charm_tests/ceph/tests.py index d45a6ad..2348e38 100644 --- a/zaza/openstack/charm_tests/ceph/tests.py +++ b/zaza/openstack/charm_tests/ceph/tests.py @@ -1226,6 +1226,12 @@ class CephRGWTest(test_utils.BaseCharmTest): def test_005_virtual_hosted_bucket(self): """Test virtual hosted bucket.""" + primary_rgw_unit = zaza_model.get_unit_from_name(self.primary_rgw_unit) + if primary_rgw_unit.workload_status != "active": + logging.info('Skipping virtual hosted bucket test since ' + 'primary rgw unit is not in active state') + return + logging.info('Testing virtual hosted bucket') # 0. Configure virtual hosted bucket @@ -1234,8 +1240,8 @@ class CephRGWTest(test_utils.BaseCharmTest): self.primary_rgw_app: { "workload-status": "blocked", "workload-status-message-prefix": - "os_public_hostname must have a value since " - "virtual_hosted_bucket_enabled is true" + "os-public-hostname must have a value " + "when virtual hosted bucket is enabled" } } zaza_model.wait_for_application_states(self.model_name,