Replace 'MagicMock' with 'Mock'

Change-Id: I7aeceede6bd3cb88cf04f398454f9758dbee20f1
Closes-Bug: #1475722

11 files changed, 24 insertions, 24 deletions

diff --git a/openstackclient/tests/unit/network/v2/fakes.py b/openstackclient/tests/unit/network/v2/fakes.py
index ed30bad3..e3adb435 100644
--- a/openstackclient/tests/unit/network/v2/fakes.py
+++ b/openstackclient/tests/unit/network/v2/fakes.py
@@ -136,7 +136,7 @@ class FakeAddressScope(object):
         """
         if address_scopes is None:
             address_scopes = FakeAddressScope.create_address_scopes(count)
-        return mock.MagicMock(side_effect=address_scopes)
+        return mock.Mock(side_effect=address_scopes)
 
 
 class FakeAvailabilityZone(object):
@@ -344,7 +344,7 @@ class FakeNetwork(object):
         """
         if networks is None:
             networks = FakeNetwork.create_networks(count)
-        return mock.MagicMock(side_effect=networks)
+        return mock.Mock(side_effect=networks)
 
 
 class FakeNetworkSegment(object):
@@ -488,7 +488,7 @@ class FakePort(object):
         """
         if ports is None:
             ports = FakePort.create_ports(count)
-        return mock.MagicMock(side_effect=ports)
+        return mock.Mock(side_effect=ports)
 
 
 class FakeNetworkAgent(object):
@@ -555,7 +555,7 @@ class FakeNetworkAgent(object):
         """
         if agents is None:
             agents = FakeNetworkAgent.create_network_agents(count)
-        return mock.MagicMock(side_effect=agents)
+        return mock.Mock(side_effect=agents)
 
 
 class FakeNetworkRBAC(object):
@@ -625,7 +625,7 @@ class FakeNetworkRBAC(object):
         """
         if rbac_policies is None:
             rbac_policies = FakeNetworkRBAC.create_network_rbacs(count)
-        return mock.MagicMock(side_effect=rbac_policies)
+        return mock.Mock(side_effect=rbac_policies)
 
 
 class FakeRouter(object):
@@ -703,7 +703,7 @@ class FakeRouter(object):
         """
         if routers is None:
             routers = FakeRouter.create_routers(count)
-        return mock.MagicMock(side_effect=routers)
+        return mock.Mock(side_effect=routers)
 
 
 class FakeSecurityGroup(object):
@@ -776,7 +776,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):
@@ -855,7 +855,7 @@ class FakeSecurityGroupRule(object):
         if security_group_rules is None:
             security_group_rules = (
                 FakeSecurityGroupRule.create_security_group_rules(count))
-        return mock.MagicMock(side_effect=security_group_rules)
+        return mock.Mock(side_effect=security_group_rules)
 
 
 class FakeSubnet(object):
@@ -938,7 +938,7 @@ class FakeSubnet(object):
         """
         if subnets is None:
             subnets = FakeSubnet.create_subnets(count)
-        return mock.MagicMock(side_effect=subnets)
+        return mock.Mock(side_effect=subnets)
 
 
 class FakeFloatingIP(object):
@@ -1015,7 +1015,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 FakeSubnetPool(object):
@@ -1097,4 +1097,4 @@ class FakeSubnetPool(object):
         """
         if subnet_pools is None:
             subnet_pools = FakeSubnetPool.create_subnet_pools(count)
-        return mock.MagicMock(side_effect=subnet_pools)
+        return mock.Mock(side_effect=subnet_pools)
diff --git a/openstackclient/tests/unit/network/v2/test_address_scope.py b/openstackclient/tests/unit/network/v2/test_address_scope.py
index 6d3f4011..12c3f1d6 100644
--- a/openstackclient/tests/unit/network/v2/test_address_scope.py
+++ b/openstackclient/tests/unit/network/v2/test_address_scope.py
@@ -216,7 +216,7 @@ class TestDeleteAddressScope(TestAddressScope):
 
         find_mock_result = [self._address_scopes[0], exceptions.CommandError]
         self.network.find_address_scope = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try:
diff --git a/openstackclient/tests/unit/network/v2/test_floating_ip.py b/openstackclient/tests/unit/network/v2/test_floating_ip.py
index a40e48f4..a77fb24b 100644
--- a/openstackclient/tests/unit/network/v2/test_floating_ip.py
+++ b/openstackclient/tests/unit/network/v2/test_floating_ip.py
@@ -204,7 +204,7 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
 
         find_mock_result = [self.floating_ips[0], exceptions.CommandError]
         self.network.find_ip = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try:
@@ -454,7 +454,7 @@ class TestDeleteFloatingIPCompute(TestFloatingIPCompute):
 
         find_mock_result = [self.floating_ips[0], exceptions.CommandError]
         self.compute.floating_ips.get = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
         self.compute.floating_ips.find.side_effect = exceptions.NotFound(None)
 
diff --git a/openstackclient/tests/unit/network/v2/test_network_agent.py b/openstackclient/tests/unit/network/v2/test_network_agent.py
index 2f17f41b..9f5b442a 100644
--- a/openstackclient/tests/unit/network/v2/test_network_agent.py
+++ b/openstackclient/tests/unit/network/v2/test_network_agent.py
@@ -96,7 +96,7 @@ class TestDeleteNetworkAgent(TestNetworkAgent):
 
         find_mock_result = [self.network_agents[0], exceptions.CommandError]
         self.network.get_agent = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try:
diff --git a/openstackclient/tests/unit/network/v2/test_network_rbac.py b/openstackclient/tests/unit/network/v2/test_network_rbac.py
index 1cd18a09..c526ae4e 100644
--- a/openstackclient/tests/unit/network/v2/test_network_rbac.py
+++ b/openstackclient/tests/unit/network/v2/test_network_rbac.py
@@ -259,7 +259,7 @@ class TestDeleteNetworkRBAC(TestNetworkRBAC):
 
         find_mock_result = [self.rbac_policies[0], exceptions.CommandError]
         self.network.find_rbac_policy = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try:
diff --git a/openstackclient/tests/unit/network/v2/test_port.py b/openstackclient/tests/unit/network/v2/test_port.py
index d5d7f330..92ad716e 100644
--- a/openstackclient/tests/unit/network/v2/test_port.py
+++ b/openstackclient/tests/unit/network/v2/test_port.py
@@ -289,7 +289,7 @@ class TestDeletePort(TestPort):
 
         find_mock_result = [self._ports[0], exceptions.CommandError]
         self.network.find_port = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try:
diff --git a/openstackclient/tests/unit/network/v2/test_router.py b/openstackclient/tests/unit/network/v2/test_router.py
index 26fe655e..de070eb2 100644
--- a/openstackclient/tests/unit/network/v2/test_router.py
+++ b/openstackclient/tests/unit/network/v2/test_router.py
@@ -263,7 +263,7 @@ class TestDeleteRouter(TestRouter):
 
         find_mock_result = [self._routers[0], exceptions.CommandError]
         self.network.find_router = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try:
diff --git a/openstackclient/tests/unit/network/v2/test_security_group.py b/openstackclient/tests/unit/network/v2/test_security_group.py
index 4c5b2972..2615b77a 100644
--- a/openstackclient/tests/unit/network/v2/test_security_group.py
+++ b/openstackclient/tests/unit/network/v2/test_security_group.py
@@ -279,7 +279,7 @@ class TestDeleteSecurityGroupNetwork(TestSecurityGroupNetwork):
 
         find_mock_result = [self._security_groups[0], exceptions.CommandError]
         self.network.find_security_group = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try:
@@ -365,7 +365,7 @@ class TestDeleteSecurityGroupCompute(TestSecurityGroupCompute):
 
         find_mock_result = [self._security_groups[0], exceptions.CommandError]
         self.compute.security_groups.get = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
         self.compute.security_groups.find.side_effect = (
             exceptions.NotFound(None))
diff --git a/openstackclient/tests/unit/network/v2/test_security_group_rule.py b/openstackclient/tests/unit/network/v2/test_security_group_rule.py
index 51e18a65..96d58e5c 100644
--- a/openstackclient/tests/unit/network/v2/test_security_group_rule.py
+++ b/openstackclient/tests/unit/network/v2/test_security_group_rule.py
@@ -723,7 +723,7 @@ class TestDeleteSecurityGroupRuleNetwork(TestSecurityGroupRuleNetwork):
         find_mock_result = [
             self._security_group_rules[0], exceptions.CommandError]
         self.network.find_security_group_rule = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try:
@@ -803,7 +803,7 @@ class TestDeleteSecurityGroupRuleCompute(TestSecurityGroupRuleCompute):
 
         find_mock_result = [None, exceptions.CommandError]
         self.compute.security_group_rules.delete = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try:
diff --git a/openstackclient/tests/unit/network/v2/test_subnet.py b/openstackclient/tests/unit/network/v2/test_subnet.py
index e31db469..6d762344 100644
--- a/openstackclient/tests/unit/network/v2/test_subnet.py
+++ b/openstackclient/tests/unit/network/v2/test_subnet.py
@@ -489,7 +489,7 @@ class TestDeleteSubnet(TestSubnet):
 
         find_mock_result = [self._subnets[0], exceptions.CommandError]
         self.network.find_subnet = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try:
diff --git a/openstackclient/tests/unit/network/v2/test_subnet_pool.py b/openstackclient/tests/unit/network/v2/test_subnet_pool.py
index 0d9494c0..e0e1969b 100644
--- a/openstackclient/tests/unit/network/v2/test_subnet_pool.py
+++ b/openstackclient/tests/unit/network/v2/test_subnet_pool.py
@@ -310,7 +310,7 @@ class TestDeleteSubnetPool(TestSubnetPool):
 
         find_mock_result = [self._subnet_pools[0], exceptions.CommandError]
         self.network.find_subnet_pool = (
-            mock.MagicMock(side_effect=find_mock_result)
+            mock.Mock(side_effect=find_mock_result)
         )
 
         try: