From 8d676bf9fa4446ddd6eaa9ae30a9845bdf775dfe Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Tue, 5 Nov 2019 15:21:21 +0100 Subject: [PATCH] Make non-existent tests/tests.yaml non-fatal where possible Not all test environments or runners are equal, don't crash on non-existent test config. --- zaza/openstack/charm_tests/mysql/tests.py | 2 +- zaza/openstack/charm_tests/test_utils.py | 2 +- zaza/openstack/charm_tests/vault/setup.py | 2 +- zaza/openstack/utilities/openstack.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zaza/openstack/charm_tests/mysql/tests.py b/zaza/openstack/charm_tests/mysql/tests.py index 1e11845..04b511e 100644 --- a/zaza/openstack/charm_tests/mysql/tests.py +++ b/zaza/openstack/charm_tests/mysql/tests.py @@ -344,7 +344,7 @@ class PerconaClusterColdStartTest(PerconaClusterTest): logging.debug("Wait for application states ...") for unit in zaza.model.get_units(self.application): zaza.model.run_on_unit(unit.entity_id, "hooks/update-status") - test_config = lifecycle_utils.get_charm_config() + test_config = lifecycle_utils.get_charm_config(fatal=False) zaza.model.wait_for_application_states( states=test_config.get("target_deploy_status", {})) diff --git a/zaza/openstack/charm_tests/test_utils.py b/zaza/openstack/charm_tests/test_utils.py index e054038..eff6b41 100644 --- a/zaza/openstack/charm_tests/test_utils.py +++ b/zaza/openstack/charm_tests/test_utils.py @@ -98,7 +98,7 @@ class OpenStackBaseTest(unittest.TestCase): """Run setup for test class to create common resourcea.""" cls.keystone_session = openstack_utils.get_overcloud_keystone_session() cls.model_name = model.get_juju_model() - cls.test_config = lifecycle_utils.get_charm_config() + cls.test_config = lifecycle_utils.get_charm_config(fatal=False) if application_name: cls.application_name = application_name else: diff --git a/zaza/openstack/charm_tests/vault/setup.py b/zaza/openstack/charm_tests/vault/setup.py index efb3a8d..03b8f65 100644 --- a/zaza/openstack/charm_tests/vault/setup.py +++ b/zaza/openstack/charm_tests/vault/setup.py @@ -84,7 +84,7 @@ def auto_initialize(cacert=None, validation_application='keystone'): allowed_domains='openstack.local') zaza.model.wait_for_agent_status() - test_config = lifecycle_utils.get_charm_config() + test_config = lifecycle_utils.get_charm_config(fatal=False) zaza.model.wait_for_application_states( states=test_config.get('target_deploy_status', {})) diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py index bff8da7..116bfed 100644 --- a/zaza/openstack/utilities/openstack.py +++ b/zaza/openstack/utilities/openstack.py @@ -713,7 +713,7 @@ def configure_gateway_ext_port(novaclient, neutronclient, net_id=None, application_name, configuration=config) zaza.model.wait_for_agent_status() - test_config = zaza.charm_lifecycle.utils.get_charm_config() + test_config = zaza.charm_lifecycle.utils.get_charm_config(fatal=False) zaza.model.wait_for_application_states( states=test_config.get('target_deploy_status', {}))