From 2a490119f776ed77c7941e6c335529d414b36ee5 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Mon, 16 Dec 2019 15:33:33 -0500 Subject: [PATCH] Fix tests to correctly call reset_mock() test_failover_loadbalancer() has two calls to 'reset' instead of reset_mock(), which do nothing, fix them. In both v1 and v2 worker tests. Change-Id: Id2193612c2829d4fdd02d5b5c5d1dd21b502eae1 --- .../tests/unit/controller/worker/v1/test_controller_worker.py | 4 ++-- .../tests/unit/controller/worker/v2/test_controller_worker.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/octavia/tests/unit/controller/worker/v1/test_controller_worker.py b/octavia/tests/unit/controller/worker/v1/test_controller_worker.py index 7092fd55fc..b9af0213dc 100644 --- a/octavia/tests/unit/controller/worker/v1/test_controller_worker.py +++ b/octavia/tests/unit/controller/worker/v1/test_controller_worker.py @@ -1362,7 +1362,7 @@ class TestControllerWorker(base.TestCase): mock_update.assert_called_with(_db_session, '123', provisioning_status=constants.ACTIVE) - mock_perform.reset + mock_perform.reset_mock() _load_balancer_mock.amphorae = [ _amphora_mock, _amphora_mock2, _amphora_mock3] _amphora_mock2.role = constants.ROLE_BACKUP @@ -1374,7 +1374,7 @@ class TestControllerWorker(base.TestCase): mock_update.assert_called_with(_db_session, '123', provisioning_status=constants.ACTIVE) - mock_perform.reset + mock_perform.reset_mock() mock_perform.side_effect = OverflowError() self.assertRaises(OverflowError, cw.failover_loadbalancer, 123) mock_update.assert_called_with(_db_session, 123, diff --git a/octavia/tests/unit/controller/worker/v2/test_controller_worker.py b/octavia/tests/unit/controller/worker/v2/test_controller_worker.py index 07779840d8..1c0f7e3c4d 100644 --- a/octavia/tests/unit/controller/worker/v2/test_controller_worker.py +++ b/octavia/tests/unit/controller/worker/v2/test_controller_worker.py @@ -1415,7 +1415,7 @@ class TestControllerWorker(base.TestCase): mock_update.assert_called_with(_db_session, '123', provisioning_status=constants.ACTIVE) - mock_perform.reset + mock_perform.reset_mock() _load_balancer_mock.amphorae = [ _amphora_mock, _amphora_mock2, _amphora_mock3] _amphora_mock2.role = constants.ROLE_BACKUP @@ -1427,7 +1427,7 @@ class TestControllerWorker(base.TestCase): mock_update.assert_called_with(_db_session, '123', provisioning_status=constants.ACTIVE) - mock_perform.reset + mock_perform.reset_mock() mock_perform.side_effect = OverflowError() self.assertRaises(OverflowError, cw.failover_loadbalancer, 123) mock_update.assert_called_with(_db_session, 123,