From 33ea7acb7e2ebdbdf21bd5096afff9f73f35e5e6 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Wed, 16 Sep 2020 11:24:16 +0200 Subject: [PATCH 1/2] Make test_manila_share more robust by retrying launching test instances on failure. https://bugs.launchpad.net/charm-manila-ganesha/+bug/1895636 --- zaza/openstack/charm_tests/manila_ganesha/tests.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/zaza/openstack/charm_tests/manila_ganesha/tests.py b/zaza/openstack/charm_tests/manila_ganesha/tests.py index 2f9f8be..9d9db70 100644 --- a/zaza/openstack/charm_tests/manila_ganesha/tests.py +++ b/zaza/openstack/charm_tests/manila_ganesha/tests.py @@ -62,13 +62,7 @@ packages: share_proto="nfs", size=1) # Spawn Servers - instance_1 = guest.launch_instance( - glance_setup.LTS_IMAGE_NAME, - vm_name='{}-ins-1'.format(self.RESOURCE_PREFIX), - userdata=self.INSTANCE_USERDATA) - instance_2 = guest.launch_instance( - glance_setup.LTS_IMAGE_NAME, - vm_name='{}-ins-2'.format(self.RESOURCE_PREFIX), + instance_1, instance_2 = self.launch_guests( userdata=self.INSTANCE_USERDATA) fip_1 = neutron_tests.floating_ips_from_instance(instance_1)[0] From 1ff71db4de7d3d4422efd2ab3e3e18060481fba0 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Thu, 17 Sep 2020 16:17:00 +0200 Subject: [PATCH 2/2] Make linter happy --- zaza/openstack/charm_tests/manila_ganesha/tests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/zaza/openstack/charm_tests/manila_ganesha/tests.py b/zaza/openstack/charm_tests/manila_ganesha/tests.py index 9d9db70..27009bf 100644 --- a/zaza/openstack/charm_tests/manila_ganesha/tests.py +++ b/zaza/openstack/charm_tests/manila_ganesha/tests.py @@ -20,7 +20,6 @@ from tenacity import Retrying, stop_after_attempt, wait_exponential from manilaclient import client as manilaclient -import zaza.openstack.charm_tests.glance.setup as glance_setup import zaza.openstack.charm_tests.neutron.tests as neutron_tests import zaza.openstack.charm_tests.nova.utils as nova_utils import zaza.openstack.charm_tests.test_utils as test_utils