4 files changed, 0 insertions, 122 deletions
diff --git a/functional/tests/object/__init__.py b/functional/tests/object/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functional/tests/object/__init__.py
+++ /dev/null
diff --git a/functional/tests/object/v1/__init__.py b/functional/tests/object/v1/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functional/tests/object/v1/__init__.py
+++ /dev/null
diff --git a/functional/tests/object/v1/test_container.py b/functional/tests/object/v1/test_container.py
deleted file mode 100644
index 4f9e843b..00000000
--- a/functional/tests/object/v1/test_container.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import uuid
-
-from functional.common import test
-
-
-class ContainerTests(test.TestCase):
-    """Functional tests for object containers. """
-    NAME = uuid.uuid4().hex
-
-    @classmethod
-    def setUpClass(cls):
-        opts = cls.get_opts(['container'])
-        raw_output = cls.openstack('container create ' + cls.NAME + opts)
-        cls.assertOutput(cls.NAME + '\n', raw_output)
-
-    @classmethod
-    def tearDownClass(cls):
-        raw_output = cls.openstack('container delete ' + cls.NAME)
-        cls.assertOutput('', raw_output)
-
-    def test_container_list(self):
-        opts = self.get_opts(['Name'])
-        raw_output = self.openstack('container list' + opts)
-        self.assertIn(self.NAME, raw_output)
-
-    def test_container_show(self):
-        opts = self.get_opts(['container'])
-        raw_output = self.openstack('container show ' + self.NAME + opts)
-        self.assertEqual(self.NAME + "\n", raw_output)
diff --git a/functional/tests/object/v1/test_object.py b/functional/tests/object/v1/test_object.py
deleted file mode 100644
index 8ea16da7..00000000
--- a/functional/tests/object/v1/test_object.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import os
-import tempfile
-import uuid
-
-from functional.common import test
-
-BASIC_LIST_HEADERS = ['Name']
-CONTAINER_FIELDS = ['account', 'container', 'x-trans-id']
-OBJECT_FIELDS = ['object', 'container', 'etag']
-
-
-class ObjectTests(test.TestCase):
-    """Functional tests for Object commands. """
-
-    CONTAINER_NAME = uuid.uuid4().hex
-
-    def test_object(self):
-        with tempfile.NamedTemporaryFile() as f:
-            f.write('test content')
-            f.flush()
-            self._test_object(f.name)
-
-    def _test_object(self, object_file):
-        raw_output = self.openstack('container create ' + self.CONTAINER_NAME)
-        items = self.parse_listing(raw_output)
-        self.assert_show_fields(items, CONTAINER_FIELDS)
-
-        raw_output = self.openstack('container list')
-        items = self.parse_listing(raw_output)
-        self.assert_table_structure(items, BASIC_LIST_HEADERS)
-
-        self.openstack('container show ' + self.CONTAINER_NAME)
-        # TODO(stevemar): Assert returned fields
-
-        self.openstack('container save ' + self.CONTAINER_NAME)
-        # TODO(stevemar): Assert returned fields
-
-        raw_output = self.openstack('object create ' + self.CONTAINER_NAME
-                                    + ' ' + object_file)
-        items = self.parse_listing(raw_output)
-        self.assert_show_fields(items, OBJECT_FIELDS)
-
-        raw_output = self.openstack('object list ' + self.CONTAINER_NAME)
-        items = self.parse_listing(raw_output)
-        self.assert_table_structure(items, BASIC_LIST_HEADERS)
-
-        self.openstack('object save ' + self.CONTAINER_NAME
-                       + ' ' + object_file)
-        # TODO(stevemar): Assert returned fields
-
-        tmp_file = 'tmp.txt'
-        self.addCleanup(os.remove, tmp_file)
-        self.openstack('object save ' + self.CONTAINER_NAME
-                       + ' ' + object_file + ' --file ' + tmp_file)
-        # TODO(stevemar): Assert returned fields
-
-        self.openstack('object show ' + self.CONTAINER_NAME
-                       + ' ' + object_file)
-        # TODO(stevemar): Assert returned fields
-
-        raw_output = self.openstack('object delete ' + self.CONTAINER_NAME
-                                    + ' ' + object_file)
-        self.assertEqual(0, len(raw_output))
-
-        self.openstack('object create ' + self.CONTAINER_NAME
-                       + ' ' + object_file)
-        raw_output = self.openstack('container delete -r ' +
-                                    self.CONTAINER_NAME)
-        self.assertEqual(0, len(raw_output))