From 6c76c3e25cbd3756e4afe3911d83c17711fcb569 Mon Sep 17 00:00:00 2001 From: Maja Massarini Date: Fri, 20 Sep 2024 14:33:09 +0200 Subject: [PATCH] Remove sync_default_files from method signatures synced_files has been removed. files_to_sync is always initialized with the default files path. If default files have not to be synchronized then they have to be removed from files_to_sync list. --- packit_service/worker/handlers/distgit.py | 1 - tests/integration/test_new_hotness_update.py | 2 -- tests/integration/test_pr_comment.py | 2 -- tests/integration/test_release_event.py | 6 ------ tests/unit/test_steve.py | 1 - 5 files changed, 12 deletions(-) diff --git a/packit_service/worker/handlers/distgit.py b/packit_service/worker/handlers/distgit.py index 7d957ad4d..d03a8d001 100644 --- a/packit_service/worker/handlers/distgit.py +++ b/packit_service/worker/handlers/distgit.py @@ -251,7 +251,6 @@ def sync_branch( create_pr=True, local_pr_branch_suffix=branch_suffix, use_downstream_specfile=is_pull_from_upstream_job, - sync_default_files=not is_pull_from_upstream_job, add_pr_instructions=True, resolved_bugs=self.get_resolved_bugs(), release_monitoring_project_id=self.data.event_dict.get( diff --git a/tests/integration/test_new_hotness_update.py b/tests/integration/test_new_hotness_update.py index 6b72bed65..2bfc742d3 100644 --- a/tests/integration/test_new_hotness_update.py +++ b/tests/integration/test_new_hotness_update.py @@ -215,7 +215,6 @@ def test_new_hotness_update(new_hotness_update, sync_release_model): create_pr=True, local_pr_branch_suffix="update-pull_from_upstream", use_downstream_specfile=True, - sync_default_files=False, add_pr_instructions=True, resolved_bugs=["rhbz#2106196"], release_monitoring_project_id=4181, @@ -388,7 +387,6 @@ def test_new_hotness_update_non_git(new_hotness_update, sync_release_model_non_g create_pr=True, local_pr_branch_suffix="update-pull_from_upstream", use_downstream_specfile=True, - sync_default_files=False, add_pr_instructions=True, resolved_bugs=["rhbz#2106196"], release_monitoring_project_id=4181, diff --git a/tests/integration/test_pr_comment.py b/tests/integration/test_pr_comment.py index 856e55810..51c04d28d 100644 --- a/tests/integration/test_pr_comment.py +++ b/tests/integration/test_pr_comment.py @@ -2698,7 +2698,6 @@ def _get_project(url, *_, **__): create_pr=True, local_pr_branch_suffix="update-pull_from_upstream", use_downstream_specfile=True, - sync_default_files=False, add_pr_instructions=True, resolved_bugs=["rhbz#123", "rhbz#124"], release_monitoring_project_id=None, @@ -2866,7 +2865,6 @@ def _get_project(url, *_, **__): create_pr=True, local_pr_branch_suffix="update-pull_from_upstream", use_downstream_specfile=True, - sync_default_files=False, add_pr_instructions=True, resolved_bugs=["rhbz#123", "rhbz#124"], release_monitoring_project_id=None, diff --git a/tests/integration/test_release_event.py b/tests/integration/test_release_event.py index cbb0afb09..56120a0e4 100644 --- a/tests/integration/test_release_event.py +++ b/tests/integration/test_release_event.py @@ -214,7 +214,6 @@ def test_dist_git_push_release_handle( create_pr=True, local_pr_branch_suffix="update-propose_downstream", use_downstream_specfile=False, - sync_default_files=True, add_pr_instructions=True, resolved_bugs=[], release_monitoring_project_id=None, @@ -357,7 +356,6 @@ def test_dist_git_push_release_handle_multiple_branches( create_pr=True, local_pr_branch_suffix="update-propose_downstream", use_downstream_specfile=False, - sync_default_files=True, add_pr_instructions=True, resolved_bugs=[], release_monitoring_project_id=None, @@ -508,7 +506,6 @@ def test_dist_git_push_release_handle_one_failed( create_pr=True, local_pr_branch_suffix="update-propose_downstream", use_downstream_specfile=False, - sync_default_files=True, add_pr_instructions=True, resolved_bugs=[], release_monitoring_project_id=None, @@ -532,7 +529,6 @@ def test_dist_git_push_release_handle_one_failed( create_pr=True, local_pr_branch_suffix="update-propose_downstream", use_downstream_specfile=False, - sync_default_files=True, add_pr_instructions=True, resolved_bugs=[], release_monitoring_project_id=None, @@ -777,7 +773,6 @@ def test_retry_propose_downstream_task( create_pr=True, local_pr_branch_suffix="update-propose_downstream", use_downstream_specfile=False, - sync_default_files=True, add_pr_instructions=True, resolved_bugs=[], release_monitoring_project_id=None, @@ -891,7 +886,6 @@ def test_dont_retry_propose_downstream_task( create_pr=True, local_pr_branch_suffix="update-propose_downstream", use_downstream_specfile=False, - sync_default_files=True, add_pr_instructions=True, resolved_bugs=[], release_monitoring_project_id=None, diff --git a/tests/unit/test_steve.py b/tests/unit/test_steve.py index 904b0ea71..883c25b9a 100644 --- a/tests/unit/test_steve.py +++ b/tests/unit/test_steve.py @@ -184,7 +184,6 @@ def test_process_message(event, private, enabled_private_namespaces, success): create_pr=True, local_pr_branch_suffix="update-propose_downstream", use_downstream_specfile=False, - sync_default_files=True, add_pr_instructions=True, resolved_bugs=[], release_monitoring_project_id=None,