Skip to content

Commit

Permalink
Stop basic_setup from raising an exception
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Liam Young committed Sep 28, 2019
1 parent 959d813 commit f64d8fe
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions zaza/openstack/charm_tests/ceilometer/setup.py
Expand Up @@ -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

Expand All @@ -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')

Expand Down

0 comments on commit f64d8fe

Please sign in to comment.