diff --git a/ceilometer/tests/tempest/api/test_telemetry_notification_api.py b/ceilometer/tests/tempest/api/test_telemetry_notification_api.py index cd25f922ba..65a86ad33e 100644 --- a/ceilometer/tests/tempest/api/test_telemetry_notification_api.py +++ b/ceilometer/tests/tempest/api/test_telemetry_notification_api.py @@ -26,6 +26,15 @@ CONF = config.CONF class TelemetryNotificationAPITest(base.BaseTelemetryTest): + @classmethod + def skip_checks(cls): + super(TelemetryNotificationAPITest, cls).skip_checks() + + if ("gnocchi" in CONF.service_available and + CONF.service_available.gnocchi): + skip_msg = ("%s skipped as gnocchi is enabled" % + cls.__name__) + raise cls.skipException(skip_msg) @decorators.idempotent_id('d7f8c1c8-d470-4731-8604-315d3956caae') @test.services('compute') @@ -57,6 +66,15 @@ class TelemetryNotificationAPITest(base.BaseTelemetryTest): class TelemetryNotificationAdminAPITest(base.BaseTelemetryAdminTest): + @classmethod + def skip_checks(cls): + super(TelemetryNotificationAdminAPITest, cls).skip_checks() + + if ("gnocchi" in CONF.service_available and + CONF.service_available.gnocchi): + skip_msg = ("%s skipped as gnocchi is enabled" % + cls.__name__) + raise cls.skipException(skip_msg) @decorators.idempotent_id('29604198-8b45-4fc0-8af8-1cae4f94ebea') @test.services('compute') diff --git a/ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py b/ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py index 1e34b2a0fb..c399a6f47e 100644 --- a/ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py +++ b/ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py @@ -53,6 +53,11 @@ class TestObjectStorageTelemetry(test.BaseTestCase): @classmethod def skip_checks(cls): super(TestObjectStorageTelemetry, cls).skip_checks() + if ("gnocchi" in CONF.service_available and + CONF.service_available.gnocchi): + skip_msg = ("%s skipped as gnocchi is enabled" % + cls.__name__) + raise cls.skipException(skip_msg) if not CONF.service_available.swift: skip_msg = ("%s skipped as swift is not available" % cls.__name__)