openstack/python-openstackclient
Code Issues Proposed changes

Merge "Replace 'MagicMock' with 'Mock'"

Browse Source
This commit is contained in:
Jenkins
2016-09-30 11:13:09 +00:00
committed by Gerrit Code Review
parent 15069ef50e 3e9749149b
commit 8031cd25d4
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
openstackclient/tests/unit/network/v2/fakes.py
View File

@@ -122,7 +122,7 @@ class FakeAddressScope(object):
@staticmethod @staticmethod
def get_address_scopes(address_scopes=None, count=2): def get_address_scopes(address_scopes=None, count=2):
"""Get an iterable MagicMock object with a list of faked address scopes. """Get an iterable Mock object with a list of faked address scopes.
If address scopes list is provided, then initialize the Mock object If address scopes list is provided, then initialize the Mock object
with the list. Otherwise create one. with the list. Otherwise create one.
@@ -331,7 +331,7 @@ class FakeNetwork(object):
@staticmethod @staticmethod
def get_networks(networks=None, count=2): def get_networks(networks=None, count=2):
"""Get an iterable MagicMock object with a list of faked networks. """Get an iterable Mock object with a list of faked networks.
If networks list is provided, then initialize the Mock object with the If networks list is provided, then initialize the Mock object with the
list. Otherwise create one. list. Otherwise create one.
@@ -478,7 +478,7 @@ class FakePort(object):
@staticmethod @staticmethod
def get_ports(ports=None, count=2): def get_ports(ports=None, count=2):
"""Get an iterable MagicMock object with a list of faked ports. """Get an iterable Mock object with a list of faked ports.
If ports list is provided, then initialize the Mock object with the If ports list is provided, then initialize the Mock object with the
list. Otherwise create one. list. Otherwise create one.
@@ -545,7 +545,7 @@ class FakeNetworkAgent(object):
@staticmethod @staticmethod
def get_network_agents(agents=None, count=2): def get_network_agents(agents=None, count=2):
"""Get an iterable MagicMock object with a list of faked network agents. """Get an iterable Mock object with a list of faked network agents.
If network agents list is provided, then initialize the Mock object If network agents list is provided, then initialize the Mock object
with the list. Otherwise create one. with the list. Otherwise create one.
@@ -615,7 +615,7 @@ class FakeNetworkRBAC(object):
@staticmethod @staticmethod
def get_network_rbacs(rbac_policies=None, count=2): def get_network_rbacs(rbac_policies=None, count=2):
"""Get an iterable MagicMock object with a list of faked rbac policies. """Get an iterable Mock object with a list of faked rbac policies.
If rbac policies list is provided, then initialize the Mock object If rbac policies list is provided, then initialize the Mock object
with the list. Otherwise create one. with the list. Otherwise create one.
@@ -694,7 +694,7 @@ class FakeRouter(object):
@staticmethod @staticmethod
def get_routers(routers=None, count=2): def get_routers(routers=None, count=2):
"""Get an iterable MagicMock object with a list of faked routers. """Get an iterable Mock object with a list of faked routers.
If routers list is provided, then initialize the Mock object with the If routers list is provided, then initialize the Mock object with the
list. Otherwise create one. list. Otherwise create one.
@@ -767,7 +767,7 @@ class FakeSecurityGroup(object):
@staticmethod @staticmethod
def get_security_groups(security_groups=None, count=2): def get_security_groups(security_groups=None, count=2):
"""Get an iterable MagicMock object with a list of faked security groups. """Get an iterable Mock object with a list of faked security groups.
If security groups list is provided, then initialize the Mock object If security groups list is provided, then initialize the Mock object
with the list. Otherwise create one. with the list. Otherwise create one.
@@ -845,7 +845,7 @@ class FakeSecurityGroupRule(object):
@staticmethod @staticmethod
def get_security_group_rules(security_group_rules=None, count=2): def get_security_group_rules(security_group_rules=None, count=2):
"""Get an iterable MagicMock object with a list of faked security group rules. """Get an iterable Mock object with a list of faked security group rules.
If security group rules list is provided, then initialize the Mock If security group rules list is provided, then initialize the Mock
object with the list. Otherwise create one. object with the list. Otherwise create one.
@@ -930,7 +930,7 @@ class FakeSubnet(object):
@staticmethod @staticmethod
def get_subnets(subnets=None, count=2): def get_subnets(subnets=None, count=2):
"""Get an iterable MagicMock object with a list of faked subnets. """Get an iterable Mock object with a list of faked subnets.
If subnets list is provided, then initialize the Mock object If subnets list is provided, then initialize the Mock object
with the list. Otherwise create one. with the list. Otherwise create one.
@@ -1008,7 +1008,7 @@ class FakeFloatingIP(object):
@staticmethod @staticmethod
def get_floating_ips(floating_ips=None, count=2): def get_floating_ips(floating_ips=None, count=2):
"""Get an iterable MagicMock object with a list of faked floating ips. """Get an iterable Mock object with a list of faked floating ips.
If floating_ips list is provided, then initialize the Mock object If floating_ips list is provided, then initialize the Mock object
with the list. Otherwise create one. with the list. Otherwise create one.
@@ -1091,7 +1091,7 @@ class FakeSubnetPool(object):
@staticmethod @staticmethod
def get_subnet_pools(subnet_pools=None, count=2): def get_subnet_pools(subnet_pools=None, count=2):
"""Get an iterable MagicMock object with a list of faked subnet pools. """Get an iterable Mock object with a list of faked subnet pools.
If subnet_pools list is provided, then initialize the Mock object If subnet_pools list is provided, then initialize the Mock object
with the list. Otherwise create one. with the list. Otherwise create one.

4
openstackclient/tests/unit/network/v2/test_network_segment.py
View File

@@ -163,7 +163,7 @@ class TestDeleteNetworkSegment(TestNetworkSegment):
super(TestDeleteNetworkSegment, self).setUp() super(TestDeleteNetworkSegment, self).setUp()
self.network.delete_segment = mock.Mock(return_value=None) self.network.delete_segment = mock.Mock(return_value=None)
self.network.find_segment = mock.MagicMock( self.network.find_segment = mock.Mock(
side_effect=self._network_segments side_effect=self._network_segments
) )
@@ -220,7 +220,7 @@ class TestDeleteNetworkSegment(TestNetworkSegment):
find_mock_result = [self._network_segments[0], find_mock_result = [self._network_segments[0],
exceptions.CommandError] exceptions.CommandError]
self.network.find_segment = ( self.network.find_segment = (
mock.MagicMock(side_effect=find_mock_result) mock.Mock(side_effect=find_mock_result)
) )
try: try: