openstack/python-openstackclient
Code Issues Proposed changes

Merge "Remove unique class names because they are scoped"

Browse Source
This commit is contained in:
Jenkins 2015-04-29 06:07:34 +00:00 committed by Gerrit Code Review
commit 4451507cce
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functional/tests/identity/v2/test_identity.py
View File

@ -16,8 +16,8 @@ from functional.common import test
BASIC_LIST_HEADERS = ['ID', 'Name']
class IdentityV2Tests(test.TestCase):
"""Functional tests for Identity V2 commands. """
class IdentityTests(test.TestCase):
"""Functional tests for Identity commands. """
USER_FIELDS = ['email', 'enabled', 'id', 'name', 'project_id', 'username']
PROJECT_FIELDS = ['enabled', 'id', 'name', 'description']

6
functional/tests/identity/v3/test_identity.py
View File

@ -19,8 +19,8 @@ from functional.common import test
BASIC_LIST_HEADERS = ['ID', 'Name']
class IdentityV3Tests(test.TestCase):
"""Functional tests for Identity V3 commands. """
class IdentityTests(test.TestCase):
"""Functional tests for Identity commands. """
DOMAIN_FIELDS = ['description', 'enabled', 'id', 'name', 'links']
GROUP_FIELDS = ['description', 'domain_id', 'id', 'name', 'links']
@ -37,7 +37,7 @@ class IdentityV3Tests(test.TestCase):
return name
def setUp(self):
super(IdentityV3Tests, self).setUp()
super(IdentityTests, self).setUp()
auth_url = os.environ.get('OS_AUTH_URL')
auth_url = auth_url.replace('v2.0', 'v3')
os.environ['OS_AUTH_URL'] = auth_url

10
functional/tests/object/v1/test_object.py
View File

@ -20,15 +20,17 @@ CONTAINER_FIELDS = ['account', 'container', 'x-trans-id']
OBJECT_FIELDS = ['object', 'container', 'etag']
class ObjectV1Tests(test.TestCase):
"""Functional tests for Object V1 commands. """
class ObjectTests(test.TestCase):
"""Functional tests for Object commands. """
CONTAINER_NAME = uuid.uuid4().hex
OBJECT_NAME = uuid.uuid4().hex
TMP_FILE = 'tmp.txt'
def setUp(self):
super(ObjectV1Tests, self).setUp()
super(ObjectTests, self).setUp()
self.addCleanup(os.remove, self.OBJECT_NAME)
self.addCleanup(os.remove, self.TMP_FILE)
with open(self.OBJECT_NAME, 'w') as f:
f.write('test content')
@ -61,7 +63,7 @@ class ObjectV1Tests(test.TestCase):
# TODO(stevemar): Assert returned fields
self.openstack('object save ' + self.CONTAINER_NAME
+ ' ' + self.OBJECT_NAME + ' --file tmp.txt')
+ ' ' + self.OBJECT_NAME + ' --file ' + self.TMP_FILE)
# TODO(stevemar): Assert returned fields
self.openstack('object show ' + self.CONTAINER_NAME