Replace 'MagicMock' with 'Mock'

Change-Id: I7aeceede6bd3cb88cf04f398454f9758dbee20f1
Closes-Bug: #1475722

Author: qiangtang

openstackclient/tests/unit/compute/v2/fakes.py

@@ -128,7 +128,7 @@ def get_aggregates(aggregates=None, count=2):
         """
         if aggregates is None:
             aggregates = FakeAggregate.create_aggregates(count)
-        return mock.MagicMock(side_effect=aggregates)
+        return mock.Mock(side_effect=aggregates)
 
 
 class FakeComputev2Client(object):
@@ -519,7 +519,7 @@ def get_security_groups(security_groups=None, count=2):
         """
         if security_groups is None:
             security_groups = FakeSecurityGroup.create_security_groups(count)
-        return mock.MagicMock(side_effect=security_groups)
+        return mock.Mock(side_effect=security_groups)
 
 
 class FakeSecurityGroupRule(object):
@@ -649,7 +649,7 @@ def get_servers(servers=None, count=2):
         """
         if servers is None:
             servers = FakeServer.create_servers(count)
-        return mock.MagicMock(side_effect=servers)
+        return mock.Mock(side_effect=servers)
 
 
 class FakeService(object):
@@ -788,7 +788,7 @@ def get_flavors(flavors=None, count=2):
         """
         if flavors is None:
             flavors = FakeFlavor.create_flavors(count)
-        return mock.MagicMock(side_effect=flavors)
+        return mock.Mock(side_effect=flavors)
 
 
 class FakeFlavorAccess(object):
@@ -887,7 +887,7 @@ def get_keypairs(keypairs=None, count=2):
         """
         if keypairs is None:
             keypairs = FakeKeypair.create_keypairs(count)
-        return mock.MagicMock(side_effect=keypairs)
+        return mock.Mock(side_effect=keypairs)
 
 
 class FakeAvailabilityZone(object):
@@ -1011,7 +1011,7 @@ def get_floating_ips(floating_ips=None, count=2):
         """
         if floating_ips is None:
             floating_ips = FakeFloatingIP.create_floating_ips(count)
-        return mock.MagicMock(side_effect=floating_ips)
+        return mock.Mock(side_effect=floating_ips)
 
 
 class FakeFloatingIPPool(object):

openstackclient/tests/unit/compute/v2/test_flavor.py

@@ -292,7 +292,7 @@ def test_multi_flavors_delete_with_exception(self):
 
         find_mock_result = [self.flavors[0], exceptions.CommandError]
         self.flavors_mock.get = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
         self.flavors_mock.find.side_effect = exceptions.NotFound(None)
 

openstackclient/tests/unit/compute/v2/test_server.py

@@ -417,7 +417,7 @@ def test_server_create_with_network(self):
 
     @mock.patch('openstackclient.compute.v2.server.io.open')
     def test_server_create_userdata(self, mock_open):
-        mock_file = mock.MagicMock(name='File')
+        mock_file = mock.Mock(name='File')
         mock_open.return_value = mock_file
         mock_open.read.return_value = '#!/bin/sh'
 

openstackclient/tests/unit/compute/v2/test_server_backup.py

@@ -101,7 +101,7 @@ def setup_images_mock(self, count, servers=None):
                 count=count,
             )
 
-        self.images_mock.get = mock.MagicMock(side_effect=images)
+        self.images_mock.get = mock.Mock(side_effect=images)
         return images
 
     def test_server_backup_defaults(self):
@@ -181,7 +181,7 @@ def test_server_backup_wait_fail(self, mock_wait_for_status):
             count=5,
         )
 
-        self.images_mock.get = mock.MagicMock(
+        self.images_mock.get = mock.Mock(
             side_effect=images,
         )
 
@@ -230,7 +230,7 @@ def test_server_backup_wait_ok(self, mock_wait_for_status):
             count=5,
         )
 
-        self.images_mock.get = mock.MagicMock(
+        self.images_mock.get = mock.Mock(
             side_effect=images,
         )
 

openstackclient/tests/unit/compute/v2/test_server_image.py

@@ -99,8 +99,8 @@ def setup_images_mock(self, count, servers=None):
                 count=count,
             )
 
-        self.images_mock.get = mock.MagicMock(side_effect=images)
-        self.servers_mock.create_image = mock.MagicMock(
+        self.images_mock.get = mock.Mock(side_effect=images)
+        self.servers_mock.create_image = mock.Mock(
             return_value=images[0].id,
         )
         return images

openstackclient/tests/unit/compute/v2/test_service.py

@@ -89,7 +89,7 @@ def test_multi_services_delete_with_exception(self):
 
         delete_mock_result = [None, exceptions.CommandError]
         self.service_mock.delete = (
-            mock.MagicMock(side_effect=delete_mock_result)
+            mock.Mock(side_effect=delete_mock_result)
         )
 
         try:

openstackclient/tests/unit/fakes.py

@@ -200,7 +200,7 @@ def _add_methods(self, methods):
         returned, which looks like a function call.
         """
         for (name, ret) in six.iteritems(methods):
-            method = mock.MagicMock(return_value=ret)
+            method = mock.Mock(return_value=ret)
             setattr(self, name, method)
 
     def __repr__(self):

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

openstackclient/tests/unit/identity/v2_0/test_role_assignment.py

@@ -170,7 +170,7 @@ def test_role_assignment_list_project_and_user(self):
 
     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
 

openstackclient/tests/unit/identity/v3/fakes.py

@@ -719,7 +719,7 @@ def get_credentials(credentials=None, count=2):
         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 @@ def get_groups(groups=None, count=2):
         if groups is None:
             groups = FakeGroup.create_groups(count)
 
-        return mock.MagicMock(side_effect=groups)
+        return mock.Mock(side_effect=groups)
 
 
 class FakeEndpoint(object):