From 0f4523fabfddf94bedf40d8284706a691a9d276b Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Wed, 20 Sep 2017 13:15:54 -0400 Subject: [PATCH] Fix up unit and functional tests --- .../task_management/test_rampart_groups.py | 18 ++++-------------- awx/main/tests/unit/test_task_manager.py | 4 ++-- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/awx/main/tests/functional/task_management/test_rampart_groups.py b/awx/main/tests/functional/task_management/test_rampart_groups.py index c81556e091..f4c6ba95bf 100644 --- a/awx/main/tests/functional/task_management/test_rampart_groups.py +++ b/awx/main/tests/functional/task_management/test_rampart_groups.py @@ -69,20 +69,10 @@ def test_multi_group_with_shared_dependency(instance_factory, default_instance_g pu.save() with mock.patch("awx.main.scheduler.TaskManager.start_task"): TaskManager().schedule() - TaskManager.start_task.assert_called_once_with(j1, ig1, []) - j1.finished = j1.created + timedelta(seconds=2) - j1.status = "successful" - j1.save() - with mock.patch("awx.main.scheduler.TaskManager.start_task"): - TaskManager().schedule() - pu = p.project_updates.last() - TaskManager.start_task.assert_called_once_with(pu, default_instance_group, [j2]) - pu.finished = pu.created + timedelta(seconds=1) - pu.status = "successful" - pu.save() - with mock.patch("awx.main.scheduler.TaskManager.start_task"): - TaskManager().schedule() - TaskManager.start_task.assert_called_once_with(j2, ig2, []) + + TaskManager.start_task.assert_any_call(j1, ig1, []) + TaskManager.start_task.assert_any_call(j2, ig2, []) + assert TaskManager.start_task.call_count == 2 @pytest.mark.django_db diff --git a/awx/main/tests/unit/test_task_manager.py b/awx/main/tests/unit/test_task_manager.py index 1937b7b5ca..9e8066c8a1 100644 --- a/awx/main/tests/unit/test_task_manager.py +++ b/awx/main/tests/unit/test_task_manager.py @@ -22,7 +22,7 @@ class TestCleanupInconsistentCeleryTasks(): @mock.patch.object(TaskManager, 'get_running_tasks', return_value=({'host1': [Job(id=2), Job(id=3),]}, [])) @mock.patch.object(InstanceGroup.objects, 'prefetch_related', return_value=[]) @mock.patch.object(Instance.objects, 'filter', return_value=mock.MagicMock(first=lambda: None)) - @mock.patch('awx.main.scheduler.logger') + @mock.patch('awx.main.scheduler.task_manager.logger') def test_instance_does_not_exist(self, logger_mock, *args): logger_mock.error = mock.MagicMock(side_effect=RuntimeError("mocked")) tm = TaskManager() @@ -38,7 +38,7 @@ class TestCleanupInconsistentCeleryTasks(): @mock.patch.object(TaskManager, 'get_active_tasks', return_value=([], {'host1': []})) @mock.patch.object(InstanceGroup.objects, 'prefetch_related', return_value=[]) @mock.patch.object(TaskManager, 'get_running_tasks') - @mock.patch('awx.main.scheduler.logger') + @mock.patch('awx.main.scheduler.task_manager.logger') def test_save_failed(self, logger_mock, get_running_tasks, *args): logger_mock.error = mock.MagicMock() job = Job(id=2, modified=tz_now(), status='running', celery_task_id='blah', execution_node='host1')