Revert "Revert extra assertions that are causing unrelated issues to surface."

This reverts commit 4925660ab4.
This commit is contained in:
mvdbeek
2018-01-30 19:04:10 +01:00
parent eb506b25b9
commit cad17b07c3
+3 -5
View File
@@ -1814,11 +1814,9 @@ test_data:
self.assertEqual("chr5\t131424298\t131424460\tCCDS4149.1_cds_0_0_chr5_131424299_f\t0\t+\n", content)
def wait_for_invocation_and_jobs(self, history_id, workflow_id, invocation_id, assert_ok=True):
# Revert after https://github.com/galaxyproject/galaxy/issues/5146 is fixed.
# state = self.workflow_populator.wait_for_invocation(workflow_id, invocation_id)
# if assert_ok:
# assert state == "scheduled", state
self.workflow_populator.wait_for_invocation(workflow_id, invocation_id)
state = self.workflow_populator.wait_for_invocation(workflow_id, invocation_id)
if assert_ok:
assert state == "scheduled", state
time.sleep(.5)
self.dataset_populator.wait_for_history_jobs(history_id, assert_ok=assert_ok)
time.sleep(.5)