Merge "Beef up object-store tests"

Author: Jenkins

openstackclient/tests/object/v1/fakes.py

@@ -13,7 +13,8 @@
 #   under the License.
 #
 
-from openstackclient.tests import fakes
+from keystoneclient import session
+from openstackclient.api import object_store_v1 as object_store
 from openstackclient.tests import utils
 
 
@@ -78,7 +79,8 @@ class TestObjectv1(utils.TestCommand):
     def setUp(self):
         super(TestObjectv1, self).setUp()
 
-        self.app.client_manager.object_store = fakes.FakeClient(
-            endpoint=fakes.AUTH_URL,
-            token=fakes.AUTH_TOKEN,
+        self.app.client_manager.session = session.Session()
+        self.app.client_manager.object_store = object_store.APIv1(
+            session=self.app.client_manager.session,
+            endpoint=ENDPOINT,
         )

openstackclient/tests/object/v1/test_container.py

@@ -74,13 +74,13 @@ def test_object_list_containers_no_options(self, c_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.container_name, ),
             (object_fakes.container_name_3, ),
             (object_fakes.container_name_2, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_containers_prefix(self, c_mock):
         c_mock.return_value = [
@@ -108,12 +108,12 @@ def test_object_list_containers_prefix(self, c_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.container_name, ),
             (object_fakes.container_name_3, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_containers_marker(self, c_mock):
         c_mock.return_value = [
@@ -144,12 +144,12 @@ def test_object_list_containers_marker(self, c_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.container_name, ),
             (object_fakes.container_name_3, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_containers_limit(self, c_mock):
         c_mock.return_value = [
@@ -177,12 +177,12 @@ def test_object_list_containers_limit(self, c_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.container_name, ),
             (object_fakes.container_name_3, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_containers_long(self, c_mock):
         c_mock.return_value = [
@@ -209,7 +209,7 @@ def test_object_list_containers_long(self, c_mock):
         )
 
         collist = ('Name', 'Bytes', 'Count')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (
                 object_fakes.container_name,
@@ -222,7 +222,7 @@ def test_object_list_containers_long(self, c_mock):
                 object_fakes.container_count * 3,
             ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_containers_all(self, c_mock):
         c_mock.return_value = [
@@ -251,13 +251,13 @@ def test_object_list_containers_all(self, c_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.container_name, ),
             (object_fakes.container_name_2, ),
             (object_fakes.container_name_3, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 @mock.patch(
@@ -295,10 +295,10 @@ def test_container_show(self, c_mock):
         )
 
         collist = ('bytes', 'count', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             object_fakes.container_bytes,
             object_fakes.container_count,
             object_fakes.container_name,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)

openstackclient/tests/object/v1/test_container_all.py

@@ -15,34 +15,25 @@
 
 from requests_mock.contrib import fixture
 
-from keystoneclient import session
-from openstackclient.api import object_store_v1 as object_store
-from openstackclient.object.v1 import container
+from openstackclient.object.v1 import container as container_cmds
 from openstackclient.tests.object.v1 import fakes as object_fakes
 
 
-class TestObjectAll(object_fakes.TestObjectv1):
+class TestContainerAll(object_fakes.TestObjectv1):
 
     def setUp(self):
-        super(TestObjectAll, self).setUp()
+        super(TestContainerAll, self).setUp()
 
-        self.app.client_manager.session = session.Session()
         self.requests_mock = self.useFixture(fixture.Fixture())
 
-        # TODO(dtroyer): move this to object_fakes.TestObjectv1
-        self.app.client_manager.object_store = object_store.APIv1(
-            session=self.app.client_manager.session,
-            endpoint=object_fakes.ENDPOINT,
-        )
-
 
-class TestContainerCreate(TestObjectAll):
+class TestContainerCreate(TestContainerAll):
 
     def setUp(self):
         super(TestContainerCreate, self).setUp()
 
         # Get the command object to test
-        self.cmd = container.CreateContainer(self.app, None)
+        self.cmd = container_cmds.CreateContainer(self.app, None)
 
     def test_object_create_container_single(self):
         self.requests_mock.register_uri(
@@ -115,13 +106,13 @@ def test_object_create_container_more(self):
         self.assertEqual(datalist, list(data))
 
 
-class TestContainerDelete(TestObjectAll):
+class TestContainerDelete(TestContainerAll):
 
     def setUp(self):
         super(TestContainerDelete, self).setUp()
 
         # Get the command object to test
-        self.cmd = container.DeleteContainer(self.app, None)
+        self.cmd = container_cmds.DeleteContainer(self.app, None)
 
     def test_object_delete_container_single(self):
         self.requests_mock.register_uri(
@@ -168,13 +159,13 @@ def test_object_delete_container_more(self):
         self.assertIsNone(ret)
 
 
-class TestContainerList(TestObjectAll):
+class TestContainerList(TestContainerAll):
 
     def setUp(self):
         super(TestContainerList, self).setUp()
 
         # Get the command object to test
-        self.cmd = container.ListContainer(self.app, None)
+        self.cmd = container_cmds.ListContainer(self.app, None)
 
     def test_object_list_containers_no_options(self):
         return_body = [
@@ -237,13 +228,13 @@ def test_object_list_containers_prefix(self):
         self.assertEqual(datalist, list(data))
 
 
-class TestContainerSave(TestObjectAll):
+class TestContainerSave(TestContainerAll):
 
     def setUp(self):
         super(TestContainerSave, self).setUp()
 
         # Get the command object to test
-        self.cmd = container.SaveContainer(self.app, None)
+        self.cmd = container_cmds.SaveContainer(self.app, None)
 
 # TODO(dtroyer): need to mock out object_lib.save_object() to test this
 #     def test_object_save_container(self):
@@ -285,13 +276,13 @@ def setUp(self):
 #         self.assertIsNone(ret)
 
 
-class TestContainerShow(TestObjectAll):
+class TestContainerShow(TestContainerAll):
 
     def setUp(self):
         super(TestContainerShow, self).setUp()
 
         # Get the command object to test
-        self.cmd = container.ShowContainer(self.app, None)
+        self.cmd = container_cmds.ShowContainer(self.app, None)
 
     def test_object_show_container(self):
         headers = {

openstackclient/tests/object/v1/test_object.py

@@ -68,12 +68,12 @@ def test_object_list_objects_no_options(self, o_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.object_name_1, ),
             (object_fakes.object_name_2, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_objects_prefix(self, o_mock):
         o_mock.return_value = [
@@ -103,11 +103,11 @@ def test_object_list_objects_prefix(self, o_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.object_name_2, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_objects_delimiter(self, o_mock):
         o_mock.return_value = [
@@ -137,11 +137,11 @@ def test_object_list_objects_delimiter(self, o_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.object_name_2, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_objects_marker(self, o_mock):
         o_mock.return_value = [
@@ -171,11 +171,11 @@ def test_object_list_objects_marker(self, o_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.object_name_2, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_objects_end_marker(self, o_mock):
         o_mock.return_value = [
@@ -205,11 +205,11 @@ def test_object_list_objects_end_marker(self, o_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.object_name_2, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_objects_limit(self, o_mock):
         o_mock.return_value = [
@@ -239,11 +239,11 @@ def test_object_list_objects_limit(self, o_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.object_name_2, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_objects_long(self, o_mock):
         o_mock.return_value = [
@@ -273,7 +273,7 @@ def test_object_list_objects_long(self, o_mock):
         )
 
         collist = ('Name', 'Bytes', 'Hash', 'Content Type', 'Last Modified')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (
                 object_fakes.object_name_1,
@@ -290,7 +290,7 @@ def test_object_list_objects_long(self, o_mock):
                 object_fakes.object_modified_2,
             ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
     def test_object_list_objects_all(self, o_mock):
         o_mock.return_value = [
@@ -321,12 +321,12 @@ def test_object_list_objects_all(self, o_mock):
         )
 
         collist = ('Name',)
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             (object_fakes.object_name_1, ),
             (object_fakes.object_name_2, ),
         )
-        self.assertEqual(tuple(data), datalist)
+        self.assertEqual(datalist, tuple(data))
 
 
 @mock.patch(
@@ -367,12 +367,12 @@ def test_object_show(self, c_mock):
         )
 
         collist = ('bytes', 'content_type', 'hash', 'last_modified', 'name')
-        self.assertEqual(columns, collist)
+        self.assertEqual(collist, columns)
         datalist = (
             object_fakes.object_bytes_1,
             object_fakes.object_content_type_1,
             object_fakes.object_hash_1,
             object_fakes.object_modified_1,
             object_fakes.object_name_1,
         )
-        self.assertEqual(data, datalist)
+        self.assertEqual(datalist, data)