openstack
/
tempest
Code Issues Proposed changes

Merge "Add a word "Test" to metering test classes"

This commit is contained in:
Jenkins 2014-12-18 12:48:53 +00:00 committed by Gerrit Code Review
parent 305bafd91d eb6af63b79
commit 8ab97ebe65
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/api/network/test_metering_extensions.py
View File

@ -23,7 +23,7 @@ from tempest import test
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
class MeteringJSON(base.BaseAdminNetworkTest): class MeteringTestJSON(base.BaseAdminNetworkTest):
_interface = 'json' _interface = 'json'
""" """
@ -36,7 +36,7 @@ class MeteringJSON(base.BaseAdminNetworkTest):
@classmethod @classmethod
def resource_setup(cls): def resource_setup(cls):
super(MeteringJSON, cls).resource_setup() super(MeteringTestJSON, cls).resource_setup()
if not test.is_extension_enabled('metering', 'network'): if not test.is_extension_enabled('metering', 'network'):
msg = "metering extension not enabled." msg = "metering extension not enabled."
raise cls.skipException(msg) raise cls.skipException(msg)
@ -145,5 +145,5 @@ class MeteringJSON(base.BaseAdminNetworkTest):
self.assertFalse(metering_label_rule['excluded']) self.assertFalse(metering_label_rule['excluded'])
class MeteringIpV6JSON(MeteringJSON): class MeteringIpV6TestJSON(MeteringTestJSON):
_ip_version = 6 _ip_version = 6