diff options
| author | TerryHowe <terrylhowe@gmail.com> | 2015-04-27 13:51:39 -0600 |
|---|---|---|
| committer | TerryHowe <terrylhowe@gmail.com> | 2015-04-27 13:51:39 -0600 |
| commit | 75d3130ab248723d324dbcd2026d14f75185cf88 (patch) | |
| tree | e75359c03845a438017c5e59dc813178a6cd238e | |
| parent | aa7e58cefb67b28ec3c3fcc6f654b41d3ecc6c4a (diff) | |
| download | python-openstackclient-75d3130ab248723d324dbcd2026d14f75185cf88.tar.gz | |
Remove unique class names because they are scoped
Remove unique class names because they are module scoped. Also,
add cleanup of the tmp file in the object test.
Change-Id: I8107a02b13ff87793ba1e56e0f0ad26890f24369
| -rw-r--r-- | functional/tests/identity/v2/test_identity.py | 4 | ||||
| -rw-r--r-- | functional/tests/identity/v3/test_identity.py | 6 | ||||
| -rw-r--r-- | functional/tests/object/v1/test_object.py | 10 |
3 files changed, 11 insertions, 9 deletions
diff --git a/functional/tests/identity/v2/test_identity.py b/functional/tests/identity/v2/test_identity.py index 37f29fc8..6d28fa51 100644 --- a/functional/tests/identity/v2/test_identity.py +++ b/functional/tests/identity/v2/test_identity.py @@ -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'] diff --git a/functional/tests/identity/v3/test_identity.py b/functional/tests/identity/v3/test_identity.py index 82319085..5d28f189 100644 --- a/functional/tests/identity/v3/test_identity.py +++ b/functional/tests/identity/v3/test_identity.py @@ -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 diff --git a/functional/tests/object/v1/test_object.py b/functional/tests/object/v1/test_object.py index 5e9ac72c..289e1ca7 100644 --- a/functional/tests/object/v1/test_object.py +++ b/functional/tests/object/v1/test_object.py @@ -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 |