openstack/ceilometer
Code Issues Proposed changes

Merge "Update tests to do not use deprecated test.services()"

Browse Source
This commit is contained in:
Zuul 2017-10-23 13:53:57 +00:00 committed by Gerrit Code Review
commit df5b3e4742
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,10 +16,10 @@ import six
import testtools
from ceilometer.tests.tempest.api import base
from tempest.common import utils
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
from tempest import test
CONF = config.CONF
@ -37,7 +37,7 @@ class TelemetryNotificationAPITest(base.BaseTelemetryTest):
raise cls.skipException(skip_msg)
@decorators.idempotent_id('d7f8c1c8-d470-4731-8604-315d3956caae')
@test.services('compute')
@utils.services('compute')
def test_check_nova_notification(self):
body = self.create_server()
@ -48,7 +48,7 @@ class TelemetryNotificationAPITest(base.BaseTelemetryTest):
self.await_samples(metric, query)
@decorators.idempotent_id('c240457d-d943-439b-8aea-85e26d64fe8f')
@test.services("image")
@utils.services("image")
@testtools.skipIf(not CONF.image_feature_enabled.api_v2,
"Glance api v2 is disabled")
def test_check_glance_v2_notifications(self):
@ -77,7 +77,7 @@ class TelemetryNotificationAdminAPITest(base.BaseTelemetryAdminTest):
raise cls.skipException(skip_msg)
@decorators.idempotent_id('29604198-8b45-4fc0-8af8-1cae4f94ebea')
@test.services('compute')
@utils.services('compute')
def test_check_nova_notification_event_and_meter(self):
body = self.create_server()

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

@ -15,6 +15,7 @@
# under the License.
from oslo_log import log as logging
from tempest.common import utils
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils
@ -138,7 +139,7 @@ class TestObjectStorageTelemetry(test.BaseTestCase):
return obj_name
@decorators.idempotent_id('6d6b88e5-3e38-41bc-b34a-79f713a6cb85')
@test.services('object_storage')
@utils.services('object_storage')
def test_swift_middleware_notifies(self):
container_name = self.create_container()
obj_name = self.upload_object_to_container(container_name)