Replace 'MagicMock' with 'Mock'

Change-Id: I7aeceede6bd3cb88cf04f398454f9758dbee20f1
Closes-Bug: #1475722

6 files changed, 14 insertions, 14 deletions

diff --git a/openstackclient/tests/unit/compute/v2/fakes.py b/openstackclient/tests/unit/compute/v2/fakes.py
index 0e3d47ba..3c829773 100644
--- a/openstackclient/tests/unit/compute/v2/fakes.py
+++ b/openstackclient/tests/unit/compute/v2/fakes.py
@@ -128,7 +128,7 @@ class FakeAggregate(object):
         """
         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 @@ class FakeSecurityGroup(object):
         """
         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 @@ class FakeServer(object):
         """
         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 @@ class FakeFlavor(object):
         """
         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 @@ class FakeKeypair(object):
         """
         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 @@ class FakeFloatingIP(object):
         """
         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):
diff --git a/openstackclient/tests/unit/compute/v2/test_flavor.py b/openstackclient/tests/unit/compute/v2/test_flavor.py
index ace650eb..93ad9d14 100644
--- a/openstackclient/tests/unit/compute/v2/test_flavor.py
+++ b/openstackclient/tests/unit/compute/v2/test_flavor.py
@@ -292,7 +292,7 @@ class TestFlavorDelete(TestFlavor):
 
         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)
 
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index d4843f51..1081b9a3 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -417,7 +417,7 @@ class TestServerCreate(TestServer):
 
     @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'
 
diff --git a/openstackclient/tests/unit/compute/v2/test_server_backup.py b/openstackclient/tests/unit/compute/v2/test_server_backup.py
index 9aa63fc7..9a481e0a 100644
--- a/openstackclient/tests/unit/compute/v2/test_server_backup.py
+++ b/openstackclient/tests/unit/compute/v2/test_server_backup.py
@@ -101,7 +101,7 @@ class TestServerBackupCreate(TestServerBackup):
                 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 @@ class TestServerBackupCreate(TestServerBackup):
             count=5,
         )
 
-        self.images_mock.get = mock.MagicMock(
+        self.images_mock.get = mock.Mock(
             side_effect=images,
         )
 
@@ -230,7 +230,7 @@ class TestServerBackupCreate(TestServerBackup):
             count=5,
         )
 
-        self.images_mock.get = mock.MagicMock(
+        self.images_mock.get = mock.Mock(
             side_effect=images,
         )
 
diff --git a/openstackclient/tests/unit/compute/v2/test_server_image.py b/openstackclient/tests/unit/compute/v2/test_server_image.py
index f53f08e6..47bd682f 100644
--- a/openstackclient/tests/unit/compute/v2/test_server_image.py
+++ b/openstackclient/tests/unit/compute/v2/test_server_image.py
@@ -99,8 +99,8 @@ class TestServerImageCreate(TestServerImage):
                 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
diff --git a/openstackclient/tests/unit/compute/v2/test_service.py b/openstackclient/tests/unit/compute/v2/test_service.py
index 1fd3b7d5..8403efc9 100644
--- a/openstackclient/tests/unit/compute/v2/test_service.py
+++ b/openstackclient/tests/unit/compute/v2/test_service.py
@@ -89,7 +89,7 @@ class TestServiceDelete(TestService):
 
         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: