Merge "Change app.restapi to app.client_manager.session"

1 files changed, 37 insertions, 35 deletions

diff --git a/openstackclient/tests/object/v1/lib/test_container.py b/openstackclient/tests/object/v1/lib/test_container.py
index f7355592..ce70b835 100644
--- a/openstackclient/tests/object/v1/lib/test_container.py
+++ b/openstackclient/tests/object/v1/lib/test_container.py
@@ -18,7 +18,7 @@
 import mock
 
 from openstackclient.object.v1.lib import container as lib_container
-from openstackclient.tests.common import test_restapi as restapi
+from openstackclient.tests import fakes
 from openstackclient.tests.object.v1 import fakes as object_fakes
 
 
@@ -39,156 +39,158 @@ class TestContainer(object_fakes.TestObjectv1):
 
     def setUp(self):
         super(TestContainer, self).setUp()
-        self.app.restapi = mock.MagicMock()
+        self.app.client_manager.session = mock.MagicMock()
 
 
 class TestContainerList(TestContainer):
 
     def test_container_list_no_options(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_container_list_marker(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             marker='next',
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
                 'marker': 'next',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_container_list_limit(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             limit=5,
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
                 'limit': 5,
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_container_list_end_marker(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             end_marker='last',
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
                 'end_marker': 'last',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_container_list_prefix(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             prefix='foo/',
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
                 'prefix': 'foo/',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_container_list_full_listing(self):
+        sess = self.app.client_manager.session
 
         def side_effect(*args, **kwargs):
-            rv = self.app.restapi.list.return_value
-            self.app.restapi.list.return_value = []
-            self.app.restapi.list.side_effect = None
+            rv = sess.get().json.return_value
+            sess.get().json.return_value = []
+            sess.get().json.side_effect = None
             return rv
 
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
-        self.app.restapi.list.side_effect = side_effect
+        sess.get().json.return_value = resp
+        sess.get().json.side_effect = side_effect
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             full_listing=True,
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        sess.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
                 'marker': 'is-name',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
 
 class TestContainerShow(TestContainer):
 
     def test_container_show_no_options(self):
         resp = {
+            'X-Container-Meta-Owner': fake_account,
             'x-container-object-count': 1,
             'x-container-bytes-used': 577,
         }
-        self.app.restapi.head.return_value = \
-            restapi.FakeResponse(headers=resp)
+        self.app.client_manager.session.head.return_value = \
+            fakes.FakeResponse(headers=resp)
 
         data = lib_container.show_container(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             'is-name',
         )
 
         # Check expected values
-        self.app.restapi.head.assert_called_with(
+        self.app.client_manager.session.head.assert_called_with(
             fake_url + '/is-name',
         )
 
@@ -202,4 +204,4 @@ class TestContainerShow(TestContainer):
             'sync_to': None,
             'sync_key': None,
         }
-        self.assertEqual(data, data_expected)
+        self.assertEqual(data_expected, data)