From c34f2b2a545ab79cb61ed5e9b43ff02e47f76163 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Tue, 26 May 2020 07:45:54 +0000 Subject: [PATCH] Enable guest restart test on ussuri As documented in the 20.05 release note the guest restart function of masakari is currently supported on ussuri+ so enable the test for bionic-ussuri+ --- zaza/openstack/charm_tests/masakari/tests.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zaza/openstack/charm_tests/masakari/tests.py b/zaza/openstack/charm_tests/masakari/tests.py index 80390f5..c2a3d85 100644 --- a/zaza/openstack/charm_tests/masakari/tests.py +++ b/zaza/openstack/charm_tests/masakari/tests.py @@ -39,6 +39,7 @@ class MasakariTest(test_utils.OpenStackBaseTest): def setUpClass(cls): """Run class setup for running tests.""" super(MasakariTest, cls).setUpClass() + cls.current_release = openstack_utils.get_os_release() cls.keystone_session = openstack_utils.get_overcloud_keystone_session() cls.model_name = zaza.model.get_juju_model() cls.nova_client = openstack_utils.get_nova_session_client( @@ -169,8 +170,12 @@ class MasakariTest(test_utils.OpenStackBaseTest): zaza.openstack.configure.masakari.enable_hosts() def test_instance_restart_on_fail(self): - """Test singlee guest crash and recovery.""" - raise unittest.SkipTest("Bug #1866638") + """Test single guest crash and recovery.""" + if self.current_release < openstack_utils.get_os_release( + 'bionic_ussuri'): + raise unittest.SkipTest( + "Not supported on {}. Bug #1866638".format( + self.current_release)) vm_name = 'zaza-test-instance-failover' vm = self.ensure_guest(vm_name) _, unit_name = self.get_guests_compute_info(vm_name) @@ -198,6 +203,6 @@ class MasakariTest(test_utils.OpenStackBaseTest): unit_name, vm.id, model_name=self.model_name) - logging.info('{} pid is now {}'.format(vm_name, guest_pid)) + logging.info('{} pid is now {}'.format(vm_name, new_guest_pid)) assert new_guest_pid and new_guest_pid != guest_pid, ( "Restart failed or never happened")