From c3d36d8c4214aafb668ed7285f23d720359c76ec Mon Sep 17 00:00:00 2001 From: xiaozhuangqing Date: Wed, 21 Sep 2016 11:07:53 +0800 Subject: [PATCH] Replace 'MagicMock' with 'Mock' Change-Id: Ide37a6e216c22e05b3d82e481a5e7c805bdaf66e --- senlinclient/tests/unit/test_shell.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/senlinclient/tests/unit/test_shell.py b/senlinclient/tests/unit/test_shell.py index edabb0c8..cd35257b 100644 --- a/senlinclient/tests/unit/test_shell.py +++ b/senlinclient/tests/unit/test_shell.py @@ -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))