From cad17b07c36ded48d3f1eaded98f0ea8e9dfd0c6 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Tue, 30 Jan 2018 19:04:10 +0100 Subject: [PATCH] Revert "Revert extra assertions that are causing unrelated issues to surface." This reverts commit 4925660ab4aa2974c6ac8e94180180bac7db9781. --- test/api/test_workflows.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/api/test_workflows.py b/test/api/test_workflows.py index 85725a22695..3cadfea5e4d 100644 --- a/test/api/test_workflows.py +++ b/test/api/test_workflows.py @@ -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)