Replace 'MagicMock' with 'Mock'

Change-Id: I7aeceede6bd3cb88cf04f398454f9758dbee20f1
Closes-Bug: #1475722

2 files changed, 10 insertions, 10 deletions

diff --git a/openstackclient/tests/unit/volume/v1/fakes.py b/openstackclient/tests/unit/volume/v1/fakes.py
index 9fb6fb9b..2a4f62c5 100644
--- a/openstackclient/tests/unit/volume/v1/fakes.py
+++ b/openstackclient/tests/unit/volume/v1/fakes.py
@@ -201,7 +201,7 @@ class FakeTransfer(object):
         if transfers is None:
             transfers = FakeTransfer.create_transfers(count)
 
-        return mock.MagicMock(side_effect=transfers)
+        return mock.Mock(side_effect=transfers)
 
 
 class FakeService(object):
@@ -274,7 +274,7 @@ class FakeService(object):
         if services is None:
             services = FakeService.create_services(count)
 
-        return mock.MagicMock(side_effect=services)
+        return mock.Mock(side_effect=services)
 
 
 class FakeQos(object):
@@ -343,7 +343,7 @@ class FakeQos(object):
         if qoses is None:
             qoses = FakeQos.create_qoses(count)
 
-        return mock.MagicMock(side_effect=qoses)
+        return mock.Mock(side_effect=qoses)
 
 
 class FakeVolume(object):
@@ -427,7 +427,7 @@ class FakeVolume(object):
         if volumes is None:
             volumes = FakeVolume.create_volumes(count)
 
-        return mock.MagicMock(side_effect=volumes)
+        return mock.Mock(side_effect=volumes)
 
 
 class FakeImagev1Client(object):
@@ -547,4 +547,4 @@ class FakeType(object):
         if types is None:
             types = FakeType.create_types(count)
 
-        return mock.MagicMock(side_effect=types)
+        return mock.Mock(side_effect=types)
diff --git a/openstackclient/tests/unit/volume/v2/fakes.py b/openstackclient/tests/unit/volume/v2/fakes.py
index babdc1f7..8d7ac831 100644
--- a/openstackclient/tests/unit/volume/v2/fakes.py
+++ b/openstackclient/tests/unit/volume/v2/fakes.py
@@ -107,7 +107,7 @@ class FakeTransfer(object):
         if transfers is None:
             transfers = FakeTransfer.create_transfers(count)
 
-        return mock.MagicMock(side_effect=transfers)
+        return mock.Mock(side_effect=transfers)
 
 
 class FakeTypeAccess(object):
@@ -331,7 +331,7 @@ class FakeVolume(object):
         if volumes is None:
             volumes = FakeVolume.create_volumes(count)
 
-        return mock.MagicMock(side_effect=volumes)
+        return mock.Mock(side_effect=volumes)
 
     @staticmethod
     def get_volume_columns(volume=None):
@@ -492,7 +492,7 @@ class FakeBackup(object):
         if backups is None:
             backups = FakeBackup.create_backups(count)
 
-        return mock.MagicMock(side_effect=backups)
+        return mock.Mock(side_effect=backups)
 
 
 class FakeExtension(object):
@@ -623,7 +623,7 @@ class FakeQos(object):
         if qoses is None:
             qoses = FakeQos.create_qoses(count)
 
-        return mock.MagicMock(side_effect=qoses)
+        return mock.Mock(side_effect=qoses)
 
 
 class FakeSnapshot(object):
@@ -696,7 +696,7 @@ class FakeSnapshot(object):
         if snapshots is None:
             snapshots = FakeSnapshot.create_snapshots(count)
 
-        return mock.MagicMock(side_effect=snapshots)
+        return mock.Mock(side_effect=snapshots)
 
 
 class FakeType(object):