diff --git a/awx/main/tasks.py b/awx/main/tasks.py index d97daf4e2b..41b66aab9d 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1710,12 +1710,10 @@ class RunProjectUpdate(BaseTask): # re-create root project folder if a natural disaster has destroyed it if not os.path.exists(settings.PROJECTS_ROOT): os.mkdir(settings.PROJECTS_ROOT) - if instance.launch_type == 'sync': - self.acquire_lock(instance) + self.acquire_lock(instance) def post_run_hook(self, instance, status, **kwargs): - if instance.launch_type == 'sync': - self.release_lock(instance) + self.release_lock(instance) p = instance.project if instance.job_type == 'check' and status not in ('failed', 'canceled',): fd = open(self.revision_path, 'r') diff --git a/awx/main/tests/functional/test_tasks.py b/awx/main/tests/functional/test_tasks.py index 84d93534c1..cbb3e281d3 100644 --- a/awx/main/tests/functional/test_tasks.py +++ b/awx/main/tests/functional/test_tasks.py @@ -32,16 +32,18 @@ class TestDependentInventoryUpdate: task.revision_path = scm_revision_file proj_update = ProjectUpdate.objects.create(project=scm_inventory_source.source_project) with mock.patch.object(RunProjectUpdate, '_update_dependent_inventories') as inv_update_mck: - task.post_run_hook(proj_update, 'successful') - inv_update_mck.assert_called_once_with(proj_update, mock.ANY) + with mock.patch.object(RunProjectUpdate, 'release_lock'): + task.post_run_hook(proj_update, 'successful') + inv_update_mck.assert_called_once_with(proj_update, mock.ANY) def test_no_unwanted_dependent_inventory_updates(self, project, scm_revision_file): task = RunProjectUpdate() task.revision_path = scm_revision_file proj_update = ProjectUpdate.objects.create(project=project) with mock.patch.object(RunProjectUpdate, '_update_dependent_inventories') as inv_update_mck: - task.post_run_hook(proj_update, 'successful') - assert not inv_update_mck.called + with mock.patch.object(RunProjectUpdate, 'release_lock'): + task.post_run_hook(proj_update, 'successful') + assert not inv_update_mck.called def test_dependent_inventory_updates(self, scm_inventory_source): task = RunProjectUpdate()