From 73be5f3b7b91579d2a3678bdf7552f4268b500bf Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Fri, 22 Sep 2023 13:03:48 +0200 Subject: [PATCH] Fix test_extract_copied_mapping_from_history ... by copying the history instead of its contents. With the change of copying hdca contents by default we'd otherwise have find the right hids, which isn't really what this test is about. --- lib/galaxy_test/api/test_workflow_extraction.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/galaxy_test/api/test_workflow_extraction.py b/lib/galaxy_test/api/test_workflow_extraction.py index c3327c0f32b3..f8f5c939852e 100644 --- a/lib/galaxy_test/api/test_workflow_extraction.py +++ b/lib/galaxy_test/api/test_workflow_extraction.py @@ -97,17 +97,14 @@ def test_extract_mapping_workflow_from_history(self, history_id): self.__assert_looks_like_randomlines_mapping_workflow(downloaded_workflow) def test_extract_copied_mapping_from_history(self, history_id): - old_history_id = self.dataset_populator.new_history() - hdca, job_id1, job_id2 = self.__run_random_lines_mapped_over_pair(old_history_id) + hdca, job_id1, job_id2 = self.__run_random_lines_mapped_over_pair(history_id) - old_contents = self._history_contents(old_history_id) - for old_content in old_contents: - self.__copy_content_to_history(history_id, old_content) + new_history_id = self.dataset_populator.copy_history(history_id).json()["id"] # API test is somewhat contrived since there is no good way # to retrieve job_id1, job_id2 like this for copied dataset # collections I don't think. downloaded_workflow = self._extract_and_download_workflow( - history_id, + new_history_id, dataset_collection_ids=[hdca["hid"]], job_ids=[job_id1, job_id2], )