From c0f04747620bfd2d62dd50959c49a96919b90b84 Mon Sep 17 00:00:00 2001 From: Ionut Balutoiu Date: Tue, 19 Mar 2024 00:44:16 +0200 Subject: [PATCH] CephRGWTest: Reorder test cases * Rename `test_004_migration_and_multisite_failover` to `test_100_migration_and_multisite_failover` * This will allow us to insert more multi-site tests after `test_003`, before scale-down scenario is run in `test_100_migration_and_multisite_failover`. * Rename `test_005_virtual_hosted_bucket` to `test_101_virtual_hosted_bucket`. * This was previously run after `test_004_migration_and_multisite_failover`. So, we rename the test case to `test_101` to keep the same order. Signed-off-by: Ionut Balutoiu --- zaza/openstack/charm_tests/ceph/tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zaza/openstack/charm_tests/ceph/tests.py b/zaza/openstack/charm_tests/ceph/tests.py index 85de53dcf..5c047c7cb 100644 --- a/zaza/openstack/charm_tests/ceph/tests.py +++ b/zaza/openstack/charm_tests/ceph/tests.py @@ -648,7 +648,7 @@ class CephRGWTest(test_utils.BaseCharmTest): This Testset is not idempotent, because we don't support scale down from multisite to singlesite (yet). Tests can be performed independently. - However, If test_004 has completed migration, retriggering the test-set + However, If test_100 has completed migration, retriggering the test-set would cause a time-out in test_003. """ @@ -1066,7 +1066,7 @@ def test_003_object_storage_and_secondary_block(self): zaza_model.block_until_unit_wl_status(self.secondary_rgw_unit, 'active') - def test_004_migration_and_multisite_failover(self): + def test_100_migration_and_multisite_failover(self): """Perform multisite migration and verify failover.""" container_name = 'zaza-container' obj_data = 'Test data from Zaza' @@ -1224,7 +1224,7 @@ def test_004_migration_and_multisite_failover(self): self.purge_bucket(self.secondary_rgw_app, 'zaza-container') self.purge_bucket(self.secondary_rgw_app, 'failover-container') - def test_005_virtual_hosted_bucket(self): + def test_101_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":