diff --git a/lib/galaxy_test/api/test_histories.py b/lib/galaxy_test/api/test_histories.py index fc7983d10a9..4d1f08c842b 100644 --- a/lib/galaxy_test/api/test_histories.py +++ b/lib/galaxy_test/api/test_histories.py @@ -390,7 +390,7 @@ class ImportExportTests(BaseHistories): self.dataset_populator.wait_for_history(history_id, assert_ok=assert_ok) return self.dataset_populator.reimport_history( - history_id, history_name, wait_on_history_length=wait_on_history_length, export_kwds=export_kwds, api_key=self.galaxy_interactor.api_key + history_id, history_name, wait_on_history_length=wait_on_history_length, export_kwds=export_kwds, ) def _import_history_and_wait(self, import_data, history_name, wait_on_history_length=None): diff --git a/lib/galaxy_test/api/test_workflow_extraction.py b/lib/galaxy_test/api/test_workflow_extraction.py index 1a4a34ae504..7d509c0d9e5 100644 --- a/lib/galaxy_test/api/test_workflow_extraction.py +++ b/lib/galaxy_test/api/test_workflow_extraction.py @@ -499,7 +499,7 @@ test_data: history_length = self.dataset_populator.history_length(history_id) new_history_id = self.dataset_populator.reimport_history( - history_id, history_name, wait_on_history_length=history_length, export_kwds={}, api_key=self.galaxy_interactor.api_key + history_id, history_name, wait_on_history_length=history_length, export_kwds={}, ) # wait a little more for those jobs, todo fix to wait for history imported false or # for a specific number of jobs... diff --git a/lib/galaxy_test/base/populators.py b/lib/galaxy_test/base/populators.py index 5e42dbbe301..9183483c2c5 100644 --- a/lib/galaxy_test/base/populators.py +++ b/lib/galaxy_test/base/populators.py @@ -972,20 +972,19 @@ class BaseDatasetPopulator(BasePopulator): assert "job_id" in job_desc return self.wait_for_job(job_desc["job_id"]) - def export_url(self, history_id: str, data, api_key: str, check_download: bool = True) -> str: + def export_url(self, history_id: str, data, check_download: bool = True) -> str: put_response = self.prepare_export(history_id, data) response = put_response.json() api_asserts.assert_has_keys(response, "download_url") download_url = urllib.parse.urljoin(self.galaxy_interactor.api_url, response["download_url"].strip('/')) if check_download: - self.get_export_url(download_url, api_key) + self.get_export_url(download_url) return download_url - def get_export_url(self, export_url, api_key) -> Response: - full_download_url = f"{export_url}?key={api_key}" - download_response = self._get(full_download_url) + def get_export_url(self, export_url) -> Response: + download_response = self._get(export_url) api_asserts.assert_status_code_is(download_response, 200) return download_response @@ -1041,11 +1040,11 @@ class BaseDatasetPopulator(BasePopulator): contents = contents_response.json() return len(contents) - def reimport_history(self, history_id, history_name, wait_on_history_length, export_kwds, api_key): + def reimport_history(self, history_id, history_name, wait_on_history_length, export_kwds): # Make history public so we can import by url self.make_public(history_id) # Export the history. - download_url = self.export_url(history_id, export_kwds, api_key, check_download=True) + download_url = self.export_url(history_id, export_kwds, check_download=True) import_data = dict(archive_source=download_url, archive_type="url")