openstack/python-senlinclient
Code Issues Proposed changes

Merge "Replace 'MagicMock' with 'Mock'"

Browse Source
This commit is contained in:
Jenkins
2016-09-22 12:45:03 +00:00
committed by Gerrit Code Review
parent d66f6cb918 c3d36d8c42
commit 9448fb41d7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
senlinclient/tests/unit/test_shell.py
View File

@@ -125,7 +125,7 @@ class ShellTest(testtools.TestCase):
subparsers = mock.Mock()
x_subparser1 = mock.Mock()
x_subparser2 = mock.Mock()
x_add_parser = mock.MagicMock(side_effect=[x_subparser1, x_subparser2])
x_add_parser = mock.Mock(side_effect=[x_subparser1, x_subparser2])
subparsers.add_parser = x_add_parser
# subparsers.add_parser = mock.Mock(return_value=x_subparser)
@@ -369,5 +369,5 @@ class ShellTest(testtools.TestCase):
mock_conn.assert_called_once_with(prof=None, user_agent=USER_AGENT,
**kwargs)
client = mock.Mock()
senlin_client.Client = mock.MagicMock(return_value=client)
senlin_client.Client = mock.Mock(return_value=client)
self.assertEqual(client, sh._setup_senlin_client('1', args))