summaryrefslogtreecommitdiff
path: root/openstackclient/tests/unit/identity/v2_0
diff options
context:
space:
mode:
authorqtang <qtang@vmware.com>2016-09-14 13:27:31 +0800
committerqtang <qtang@vmware.com>2016-09-14 17:59:31 +0800
commitbc222e97b155152be3c8cced987ef1d443076d10 (patch)
tree2bb4ee7dfcf010f723cda3a84a86db5a5bc29a14 /openstackclient/tests/unit/identity/v2_0
parent6f326acd260d035cb024f0c5e3ef2237277d8b37 (diff)
downloadpython-openstackclient-bc222e97b155152be3c8cced987ef1d443076d10.tar.gz
Replace 'MagicMock' with 'Mock'
Change-Id: I7aeceede6bd3cb88cf04f398454f9758dbee20f1 Closes-Bug: #1475722
Diffstat (limited to 'openstackclient/tests/unit/identity/v2_0')
-rw-r--r--openstackclient/tests/unit/identity/v2_0/test_catalog.py4
-rw-r--r--openstackclient/tests/unit/identity/v2_0/test_role_assignment.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/tests/unit/identity/v2_0/test_catalog.py b/openstackclient/tests/unit/identity/v2_0/test_catalog.py
index c32f9fb8..65af58a2 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_catalog.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_catalog.py
@@ -25,12 +25,12 @@ class TestCatalog(utils.TestCommand):
def setUp(self):
super(TestCatalog, self).setUp()
- self.sc_mock = mock.MagicMock()
+ self.sc_mock = mock.Mock()
self.sc_mock.service_catalog.catalog.return_value = [
self.service_catalog,
]
- self.auth_mock = mock.MagicMock()
+ self.auth_mock = mock.Mock()
self.app.client_manager.session = self.auth_mock
self.auth_mock.auth.get_auth_ref.return_value = self.sc_mock
diff --git a/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py b/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py
index 27306959..87643f12 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py
@@ -170,7 +170,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
def test_role_assignment_list_def_creds(self):
- auth_ref = self.app.client_manager.auth_ref = mock.MagicMock()
+ auth_ref = self.app.client_manager.auth_ref = mock.Mock()
auth_ref.project_id.return_value = identity_fakes.project_id
auth_ref.user_id.return_value = identity_fakes.user_id