From 4a6418e939fd813a88f9ba30adf14cdea5eb9a91 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Fri, 8 Jul 2022 11:17:28 +0100 Subject: [PATCH] Prometheus has registered a non-zero num of osds (#820) Change prometheus test to check it has a non-zero amount of OSDs registered rather than a specific number. This stops the number of OSDs having to be managed in the tests. --- zaza/openstack/charm_tests/ceph/tests.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zaza/openstack/charm_tests/ceph/tests.py b/zaza/openstack/charm_tests/ceph/tests.py index b148692..e1d0626 100644 --- a/zaza/openstack/charm_tests/ceph/tests.py +++ b/zaza/openstack/charm_tests/ceph/tests.py @@ -942,10 +942,9 @@ class CephPrometheusTest(unittest.TestCase): raise unittest.SkipTest('Prometheus not present, skipping test') unit = zaza_model.get_unit_from_name( zaza_model.get_lead_unit_name('prometheus2')) - self.assertEqual( - '3', - _get_mon_count_from_prometheus( - zaza_model.get_unit_public_address(unit))) + prometheus_mon_count = _get_mon_count_from_prometheus( + zaza_model.get_unit_public_address(unit)) + self.assertTrue(0 < int(prometheus_mon_count)) class CephPoolConfig(Exception):