From f64d8fe70e6b0d218307ad9ee8104622bb74a5f2 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Sat, 28 Sep 2019 06:48:25 +0000 Subject: [PATCH] Stop basic_setup from raising an exception The ceilometer setup script is a setup script not a test so it should not raise a skip exception if it is not needed. The fact that it does is my fault and was implemented on my recommendation. --- zaza/openstack/charm_tests/ceilometer/setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zaza/openstack/charm_tests/ceilometer/setup.py b/zaza/openstack/charm_tests/ceilometer/setup.py index 1cd9b2d..c966077 100644 --- a/zaza/openstack/charm_tests/ceilometer/setup.py +++ b/zaza/openstack/charm_tests/ceilometer/setup.py @@ -17,7 +17,6 @@ """Code for configuring Ceilometer.""" import logging -import unittest import zaza.model as zaza_model import zaza.openstack.utilities.openstack as openstack_utils @@ -32,8 +31,9 @@ def basic_setup(): xenial_pike = openstack_utils.get_os_release('xenial_pike') if current_release < xenial_pike: - raise unittest.SkipTest('Skipping ceilometer-upgrade as it is not ' - 'supported before Pike') + logging.info( + 'Skipping ceilometer-upgrade as it is not supported before Pike') + return logging.debug('Checking ceilometer-upgrade')