From 38317c3bc202bf338d9560903e140e8bed3bcc23 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Tue, 8 Sep 2020 12:24:26 +0200 Subject: [PATCH 1/2] Make RmqTests.test_910_pause_and_resume more robust --- zaza/openstack/charm_tests/rabbitmq_server/tests.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/zaza/openstack/charm_tests/rabbitmq_server/tests.py b/zaza/openstack/charm_tests/rabbitmq_server/tests.py index bbb6c3b..3470bad 100644 --- a/zaza/openstack/charm_tests/rabbitmq_server/tests.py +++ b/zaza/openstack/charm_tests/rabbitmq_server/tests.py @@ -276,15 +276,23 @@ class RmqTests(test_utils.OpenStackBaseTest): """The services can be paused and resumed.""" logging.info('Checking pause and resume actions...') + logging.info('Waiting for the cluster to be ready') + rmq_utils.wait_for_cluster() unit = zaza.model.get_units(self.application_name)[0] assert unit.workload_status == "active" + logging.info('Pausing unit {}'.format(unit)) zaza.model.run_action(unit.entity_id, "pause") + logging.info('Waiting until unit {} reaches "maintenance" state' + ''.format(unit)) zaza.model.block_until_unit_wl_status(unit.entity_id, "maintenance") unit = zaza.model.get_unit_from_name(unit.entity_id) assert unit.workload_status == "maintenance" + logging.info('Resuming unit {}'.format(unit)) zaza.model.run_action(unit.entity_id, "resume") + logging.info('Waiting until unit {} reaches "active" state' + ''.format(unit)) zaza.model.block_until_unit_wl_status(unit.entity_id, "active") unit = zaza.model.get_unit_from_name(unit.entity_id) assert unit.workload_status == "active" From 4eef19197dbceae5a2d0799211290f6f0facb169 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Wed, 9 Sep 2020 09:49:15 +0200 Subject: [PATCH 2/2] Add missing blank --- zaza/openstack/charm_tests/rabbitmq_server/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zaza/openstack/charm_tests/rabbitmq_server/tests.py b/zaza/openstack/charm_tests/rabbitmq_server/tests.py index 3470bad..d4a3111 100644 --- a/zaza/openstack/charm_tests/rabbitmq_server/tests.py +++ b/zaza/openstack/charm_tests/rabbitmq_server/tests.py @@ -364,7 +364,7 @@ class RmqTests(test_utils.OpenStackBaseTest): return rmq_utils.check_unit_cluster_nodes(u, unit_node_names) @unittest.skip( - "Skipping as a significant rework is required, see" + "Skipping as a significant rework is required, see " "https://github.com/openstack-charmers/zaza-openstack-tests/issues/290" ) def test_921_remove_and_add_unit(self):