From c99dd870df00250b88fbfcab2ebd5fc787e78a30 Mon Sep 17 00:00:00 2001 From: "Kai Qiang Wu(Kennan)" Date: Fri, 10 Jul 2015 09:21:42 +0000 Subject: [PATCH] Fix unit test failure As some unit tests failed silent before, which not noticed by old mock. So we need fix them to make unit tests right. Closes-Bug: #1473344 Change-Id: Ib2be4270732b1ca04c4d0117be6378b3a31fe83c --- magnum/tests/unit/api/controllers/v1/test_container.py | 6 ++++-- .../unit/conductor/handlers/common/test_docker_client.py | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/magnum/tests/unit/api/controllers/v1/test_container.py b/magnum/tests/unit/api/controllers/v1/test_container.py index 180db95617..f50ab023b7 100644 --- a/magnum/tests/unit/api/controllers/v1/test_container.py +++ b/magnum/tests/unit/api/controllers/v1/test_container.py @@ -375,7 +375,8 @@ class TestContainerController(db_base.DbTestCase): cmd = {'command': 'ls'} response = self.app.put(url, cmd) self.assertEqual(response.status_int, 200) - mock_container_exec.assert_called_one_with(container_uuid, cmd) + mock_container_exec.assert_called_once_with(container_uuid, + cmd['command']) @patch('magnum.conductor.api.API.container_exec') @patch('magnum.objects.Container.get_by_name') @@ -391,7 +392,8 @@ class TestContainerController(db_base.DbTestCase): cmd = {'command': 'ls'} response = self.app.put(url, cmd) self.assertEqual(response.status_int, 200) - mock_container_exec.assert_called_one_with(container_uuid, cmd) + mock_container_exec.assert_called_once_with(container_uuid, + cmd['command']) @patch('magnum.conductor.api.API.container_delete') @patch('magnum.objects.Container.get_by_uuid') diff --git a/magnum/tests/unit/conductor/handlers/common/test_docker_client.py b/magnum/tests/unit/conductor/handlers/common/test_docker_client.py index cdb49c5775..ae50715d77 100644 --- a/magnum/tests/unit/conductor/handlers/common/test_docker_client.py +++ b/magnum/tests/unit/conductor/handlers/common/test_docker_client.py @@ -99,7 +99,7 @@ class DockerClientTestCase(base.BaseTestCase): client.pause('someid') mock_url.assert_called_once_with('/containers/someid/pause') - mock_post.assert_callend_once_with(mock_url.return_value) + mock_post.assert_called_once_with(mock_url.return_value) mock_raise_for_status.assert_called_once_with( mock_post.return_value) @@ -113,7 +113,7 @@ class DockerClientTestCase(base.BaseTestCase): client.pause(dict(Id='someid')) mock_url.assert_called_once_with('/containers/someid/pause') - mock_post.assert_callend_once_with(mock_url.return_value) + mock_post.assert_called_once_with(mock_url.return_value) mock_raise_for_status.assert_called_once_with( mock_post.return_value) @@ -126,7 +126,7 @@ class DockerClientTestCase(base.BaseTestCase): client.unpause('someid') mock_url.assert_called_once_with('/containers/someid/unpause') - mock_post.assert_callend_once_with(mock_url.return_value) + mock_post.assert_called_once_with(mock_url.return_value) mock_raise_for_status.assert_called_once_with( mock_post.return_value) @@ -140,7 +140,7 @@ class DockerClientTestCase(base.BaseTestCase): client.unpause(dict(Id='someid')) mock_url.assert_called_once_with('/containers/someid/unpause') - mock_post.assert_callend_once_with(mock_url.return_value) + mock_post.assert_called_once_with(mock_url.return_value) mock_raise_for_status.assert_called_once_with( mock_post.return_value)