diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-29 05:53:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-29 05:53:09 +0000 |
| commit | 075987267b5ecd794e512ecf8d178368c4a1cbfa (patch) | |
| tree | 8a7ced112d4749daef7ba50ce7f845e4c3aea66f /functional/tests/object/v1/test_object.py | |
| parent | cf52e722c0c37ce2f69b9ca0684890033c8c06c6 (diff) | |
| parent | aa7e58cefb67b28ec3c3fcc6f654b41d3ecc6c4a (diff) | |
| download | python-openstackclient-075987267b5ecd794e512ecf8d178368c4a1cbfa.tar.gz | |
Merge "Functional tests run in many environments"
Diffstat (limited to 'functional/tests/object/v1/test_object.py')
| -rw-r--r-- | functional/tests/object/v1/test_object.py | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/functional/tests/object/v1/test_object.py b/functional/tests/object/v1/test_object.py index 4121524a..5e9ac72c 100644 --- a/functional/tests/object/v1/test_object.py +++ b/functional/tests/object/v1/test_object.py @@ -32,63 +32,45 @@ class ObjectV1Tests(test.TestCase): with open(self.OBJECT_NAME, 'w') as f: f.write('test content') - def test_container_create(self): + def test_object(self): raw_output = self.openstack('container create ' + self.CONTAINER_NAME) items = self.parse_listing(raw_output) self.assert_show_fields(items, CONTAINER_FIELDS) - def test_container_delete(self): - container_tmp = uuid.uuid4().hex - self.openstack('container create ' + container_tmp) - raw_output = self.openstack('container delete ' + container_tmp) - self.assertEqual(0, len(raw_output)) - - def test_container_list(self): raw_output = self.openstack('container list') items = self.parse_listing(raw_output) self.assert_table_structure(items, BASIC_LIST_HEADERS) - def test_container_show(self): self.openstack('container show ' + self.CONTAINER_NAME) # TODO(stevemar): Assert returned fields - def test_container_save(self): self.openstack('container save ' + self.CONTAINER_NAME) # TODO(stevemar): Assert returned fields - def test_object_create(self): raw_output = self.openstack('object create ' + self.CONTAINER_NAME + ' ' + self.OBJECT_NAME) items = self.parse_listing(raw_output) self.assert_show_fields(items, OBJECT_FIELDS) - def test_object_delete(self): - raw_output = self.openstack('object delete ' + self.CONTAINER_NAME - + ' ' + self.OBJECT_NAME) - self.assertEqual(0, len(raw_output)) - - def test_object_list(self): raw_output = self.openstack('object list ' + self.CONTAINER_NAME) items = self.parse_listing(raw_output) self.assert_table_structure(items, BASIC_LIST_HEADERS) - def test_object_save(self): - self.openstack('object create ' + self.CONTAINER_NAME - + ' ' + self.OBJECT_NAME) self.openstack('object save ' + self.CONTAINER_NAME + ' ' + self.OBJECT_NAME) # TODO(stevemar): Assert returned fields - def test_object_save_with_filename(self): - self.openstack('object create ' + self.CONTAINER_NAME - + ' ' + self.OBJECT_NAME) self.openstack('object save ' + self.CONTAINER_NAME + ' ' + self.OBJECT_NAME + ' --file tmp.txt') # TODO(stevemar): Assert returned fields - def test_object_show(self): - self.openstack('object create ' + self.CONTAINER_NAME - + ' ' + self.OBJECT_NAME) self.openstack('object show ' + self.CONTAINER_NAME + ' ' + self.OBJECT_NAME) # TODO(stevemar): Assert returned fields + + raw_output = self.openstack('object delete ' + self.CONTAINER_NAME + + ' ' + self.OBJECT_NAME) + self.assertEqual(0, len(raw_output)) + + raw_output = self.openstack('container delete ' + self.CONTAINER_NAME) + self.assertEqual(0, len(raw_output)) |