summaryrefslogtreecommitdiff
path: root/openstackclient/tests/object
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2013-11-25 14:46:52 -0600
committerDean Troyer <dtroyer@gmail.com>2013-11-25 14:46:57 -0600
commit935781fdf961d0501b7400acbe4c86bdd9f284f2 (patch)
treea90c914e6f3a4f82d5d007892f30356d1c4b4dec /openstackclient/tests/object
parent9062811d10f2ab660ce38f9bd20be9c52daa9479 (diff)
downloadpython-openstackclient-935781fdf961d0501b7400acbe4c86bdd9f284f2.tar.gz
Restore Object API name 'object-store'
It's used in the service catalog, doh! Change-Id: If8f6db49c84756fd8e58cc68910160da4cd99b5d
Diffstat (limited to 'openstackclient/tests/object')
-rw-r--r--openstackclient/tests/object/v1/fakes.py2
-rw-r--r--openstackclient/tests/object/v1/test_container.py10
-rw-r--r--openstackclient/tests/object/v1/test_object.py10
3 files changed, 17 insertions, 5 deletions
diff --git a/openstackclient/tests/object/v1/fakes.py b/openstackclient/tests/object/v1/fakes.py
index 37c35d3b..87f6cab6 100644
--- a/openstackclient/tests/object/v1/fakes.py
+++ b/openstackclient/tests/object/v1/fakes.py
@@ -81,7 +81,7 @@ class TestObjectv1(utils.TestCommand):
def setUp(self):
super(TestObjectv1, self).setUp()
- self.app.client_manager.object = FakeObjectv1Client(
+ self.app.client_manager.object_store = FakeObjectv1Client(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,
)
diff --git a/openstackclient/tests/object/v1/test_container.py b/openstackclient/tests/object/v1/test_container.py
index e4d90fd9..4afb1006 100644
--- a/openstackclient/tests/object/v1/test_container.py
+++ b/openstackclient/tests/object/v1/test_container.py
@@ -38,8 +38,14 @@ class TestObject(object_fakes.TestObjectv1):
class TestObjectClient(TestObject):
def test_make_client(self):
- self.assertEqual(self.app.client_manager.object.endpoint, AUTH_URL)
- self.assertEqual(self.app.client_manager.object.token, AUTH_TOKEN)
+ self.assertEqual(
+ self.app.client_manager.object_store.endpoint,
+ AUTH_URL,
+ )
+ self.assertEqual(
+ self.app.client_manager.object_store.token,
+ AUTH_TOKEN,
+ )
@mock.patch(
diff --git a/openstackclient/tests/object/v1/test_object.py b/openstackclient/tests/object/v1/test_object.py
index 9987c2d4..bea0d270 100644
--- a/openstackclient/tests/object/v1/test_object.py
+++ b/openstackclient/tests/object/v1/test_object.py
@@ -32,8 +32,14 @@ class TestObject(object_fakes.TestObjectv1):
class TestObjectClient(TestObject):
def test_make_client(self):
- self.assertEqual(self.app.client_manager.object.endpoint, AUTH_URL)
- self.assertEqual(self.app.client_manager.object.token, AUTH_TOKEN)
+ self.assertEqual(
+ self.app.client_manager.object_store.endpoint,
+ AUTH_URL,
+ )
+ self.assertEqual(
+ self.app.client_manager.object_store.token,
+ AUTH_TOKEN,
+ )
@mock.patch(