Replace 'MagicMock' with 'Mock'

Change-Id: I7aeceede6bd3cb88cf04f398454f9758dbee20f1
Closes-Bug: #1475722

7 files changed, 12 insertions, 12 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
 
diff --git a/openstackclient/tests/unit/identity/v3/fakes.py b/openstackclient/tests/unit/identity/v3/fakes.py
index 7b76fa60..75065e65 100644
--- a/openstackclient/tests/unit/identity/v3/fakes.py
+++ b/openstackclient/tests/unit/identity/v3/fakes.py
@@ -719,7 +719,7 @@ class FakeCredential(object):
         if credentials is None:
             credentials = FakeCredential.create_credentials(count)
 
-        return mock.MagicMock(side_effect=credentials)
+        return mock.Mock(side_effect=credentials)
 
 
 class FakeUser(object):
@@ -819,7 +819,7 @@ class FakeGroup(object):
         if groups is None:
             groups = FakeGroup.create_groups(count)
 
-        return mock.MagicMock(side_effect=groups)
+        return mock.Mock(side_effect=groups)
 
 
 class FakeEndpoint(object):
diff --git a/openstackclient/tests/unit/identity/v3/test_catalog.py b/openstackclient/tests/unit/identity/v3/test_catalog.py
index 986c05f3..53008e8c 100644
--- a/openstackclient/tests/unit/identity/v3/test_catalog.py
+++ b/openstackclient/tests/unit/identity/v3/test_catalog.py
@@ -50,12 +50,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.fake_service,
         ]
 
-        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/v3/test_credential.py b/openstackclient/tests/unit/identity/v3/test_credential.py
index fd3ae6b2..ce0fb5ae 100644
--- a/openstackclient/tests/unit/identity/v3/test_credential.py
+++ b/openstackclient/tests/unit/identity/v3/test_credential.py
@@ -196,7 +196,7 @@ class TestCredentialDelete(TestCredential):
 
         delete_mock_result = [None, exceptions.CommandError]
         self.credentials_mock.delete = (
-            mock.MagicMock(side_effect=delete_mock_result)
+            mock.Mock(side_effect=delete_mock_result)
         )
 
         try:
diff --git a/openstackclient/tests/unit/identity/v3/test_group.py b/openstackclient/tests/unit/identity/v3/test_group.py
index d35e98c6..eb50adb5 100644
--- a/openstackclient/tests/unit/identity/v3/test_group.py
+++ b/openstackclient/tests/unit/identity/v3/test_group.py
@@ -239,7 +239,7 @@ class TestGroupDelete(TestGroup):
     def test_group_delete_with_domain(self):
         get_mock_result = [exceptions.CommandError, self.groups[0]]
         self.groups_mock.get = (
-            mock.MagicMock(side_effect=get_mock_result))
+            mock.Mock(side_effect=get_mock_result))
 
         arglist = [
             '--domain', self.domain.id,
@@ -487,7 +487,7 @@ class TestGroupSet(TestGroup):
     def test_group_set_with_domain(self):
         get_mock_result = [exceptions.CommandError, self.group]
         self.groups_mock.get = (
-            mock.MagicMock(side_effect=get_mock_result))
+            mock.Mock(side_effect=get_mock_result))
 
         arglist = [
             '--domain', self.domain.id,
@@ -550,7 +550,7 @@ class TestGroupShow(TestGroup):
     def test_group_show_with_domain(self):
         get_mock_result = [exceptions.CommandError, self.group]
         self.groups_mock.get = (
-            mock.MagicMock(side_effect=get_mock_result))
+            mock.Mock(side_effect=get_mock_result))
 
         arglist = [
             '--domain', self.domain.id,
diff --git a/openstackclient/tests/unit/identity/v3/test_role_assignment.py b/openstackclient/tests/unit/identity/v3/test_role_assignment.py
index 7102a0cd..32fbb7f1 100644
--- a/openstackclient/tests/unit/identity/v3/test_role_assignment.py
+++ b/openstackclient/tests/unit/identity/v3/test_role_assignment.py
@@ -377,7 +377,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