summaryrefslogtreecommitdiff
path: root/functional/tests/object/v1
diff options
context:
space:
mode:
authorTerryHowe <terrylhowe@gmail.com>2015-04-27 13:51:39 -0600
committerTerryHowe <terrylhowe@gmail.com>2015-04-27 13:51:39 -0600
commit75d3130ab248723d324dbcd2026d14f75185cf88 (patch)
treee75359c03845a438017c5e59dc813178a6cd238e /functional/tests/object/v1
parentaa7e58cefb67b28ec3c3fcc6f654b41d3ecc6c4a (diff)
downloadpython-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
Diffstat (limited to 'functional/tests/object/v1')
-rw-r--r--functional/tests/object/v1/test_object.py10
1 files changed, 6 insertions, 4 deletions
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