opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix typing in test populator

Browse Source
This commit is contained in:
davelopez
2022-12-02 09:57:29 +01:00
parent f98da7349c
commit a8dd40e0ab
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy_test/base/populators.py
+4 -3
View File
@@ -64,6 +64,7 @@ from typing import (
Tuple,
Union,
)
from uuid import UUID
import cwltest.utils
import requests
@@ -1209,7 +1210,7 @@ class BaseDatasetPopulator(BasePopulator):
storage_request_id = self.assert_download_request_ok(download_request_response)
return self.wait_on_download_request(storage_request_id)
def assert_download_request_ok(self, download_request_response: Response) -> str:
def assert_download_request_ok(self, download_request_response: Response) -> UUID:
"""Assert response is valid and okay and extract storage request ID."""
api_asserts.assert_status_code_is(download_request_response, 200)
download_async = download_request_response.json()
@@ -1217,7 +1218,7 @@ class BaseDatasetPopulator(BasePopulator):
storage_request_id = download_async["storage_request_id"]
return storage_request_id
def wait_for_download_ready(self, storage_request_id: str):
def wait_for_download_ready(self, storage_request_id: UUID):
def is_ready():
is_ready_response = self._get(f"short_term_storage/{storage_request_id}/ready")
is_ready_response.raise_for_status()
@@ -1244,7 +1245,7 @@ class BaseDatasetPopulator(BasePopulator):
wait_on(is_ready, "waiting for task to complete")
return state() == "SUCCESS"
def wait_on_download_request(self, storage_request_id: str) -> Response:
def wait_on_download_request(self, storage_request_id: UUID) -> Response:
self.wait_for_download_ready(storage_request_id)
download_contents_response = self._get(f"short_term_storage/{storage_request_id}")
download_contents_response.raise_for_status()