openstack/ceilometer
Code Issues Proposed changes

Merge "tempest: skip legacy telemetry-api tests"

Browse Source
This commit is contained in:
Jenkins 2017-03-10 16:32:10 +00:00 committed by Gerrit Code Review
commit c66d5648db
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ceilometer/tests/tempest/api/test_telemetry_notification_api.py
View File

@ -26,6 +26,15 @@ CONF = config.CONF
class TelemetryNotificationAPITest(base.BaseTelemetryTest): 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') @decorators.idempotent_id('d7f8c1c8-d470-4731-8604-315d3956caae')
@test.services('compute') @test.services('compute')
@ -57,6 +66,15 @@ class TelemetryNotificationAPITest(base.BaseTelemetryTest):
class TelemetryNotificationAdminAPITest(base.BaseTelemetryAdminTest): 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') @decorators.idempotent_id('29604198-8b45-4fc0-8af8-1cae4f94ebea')
@test.services('compute') @test.services('compute')

5
ceilometer/tests/tempest/scenario/test_object_storage_telemetry_middleware.py
View File

@ -53,6 +53,11 @@ class TestObjectStorageTelemetry(test.BaseTestCase):
@classmethod @classmethod
def skip_checks(cls): def skip_checks(cls):
super(TestObjectStorageTelemetry, cls).skip_checks() 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: if not CONF.service_available.swift:
skip_msg = ("%s skipped as swift is not available" % skip_msg = ("%s skipped as swift is not available" %
cls.__name__) cls.__name__)