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

Optionally allow dataset populators to fail

Browse Source
This commit is contained in:
mvdbeek
2017-12-15 13:36:38 +01:00
parent 9ee2a7d457
commit b39772011a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/base/populators.py
+3 -3
View File
@@ -114,15 +114,15 @@ class BaseDatasetPopulator(object):
payload = self.upload_payload(history_id, content, **kwds)
run_response = self.tools_post(payload)
if wait:
self.wait_for_tool_run(history_id, run_response)
self.wait_for_tool_run(history_id, run_response, kwds.get('assert_ok', True))
return run_response
def wait_for_tool_run(self, history_id, run_response):
def wait_for_tool_run(self, history_id, run_response, assert_ok=True):
run = run_response.json()
assert run_response.status_code == 200, run
job = run["jobs"][0]
self.wait_for_job(job["id"])
self.wait_for_history(history_id, assert_ok=True)
self.wait_for_history(history_id, assert_ok=assert_ok)
return run_response
def wait_for_history(self, history_id, assert_ok=False, timeout=DEFAULT_TIMEOUT):