commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/fe0b5d1b527f/ Changeset: fe0b5d1b527f User: jmchilton Date: 2014-07-25 18:51:10 Summary: Extend API test timeouts. Some buildbot API tests are timing out waiting but work locally, I suspect this will fix the problem. Affected #: 1 file diff -r f002131cb905ad4e578635c8a8b655e07cf701f0 -r fe0b5d1b527fadd503baeaa15089b19c9f75fbde test/api/helpers.py --- a/test/api/helpers.py +++ b/test/api/helpers.py @@ -12,7 +12,7 @@ # row - first grabbing 8 lines at random and then 6. workflow_random_x2_str = resource_string( __name__, "test_workflow_2.ga" ) -DEFAULT_HISTORY_TIMEOUT = 5 # Secs to wait on history to turn ok +DEFAULT_HISTORY_TIMEOUT = 10 # Secs to wait on history to turn ok def skip_without_tool( tool_id ): https://bitbucket.org/galaxy/galaxy-central/commits/f1123017cfcd/ Changeset: f1123017cfcd User: jmchilton Date: 2014-07-25 18:51:11 Summary: Fix API tests for 879c485... Which made tool multirun link/match instead cross producting (will someday figure a terminology for this :)). Affected #: 1 file diff -r fe0b5d1b527fadd503baeaa15089b19c9f75fbde -r f1123017cfcd1f1c2531b62624ceac4e28aa6dd4 test/api/test_tools.py --- a/test/api/test_tools.py +++ b/test/api/test_tools.py @@ -189,13 +189,16 @@ ], } outputs = self._cat1_outputs( history_id, inputs=inputs ) - self.assertEquals( len( outputs ), 4 ) + self.assertEquals( len( outputs ), 2 ) self.dataset_populator.wait_for_history( history_id, assert_ok=True ) outputs_contents = [ self._get_content( history_id, dataset=o ).strip() for o in outputs ] assert "123\n789" in outputs_contents - assert "456\n789" in outputs_contents - assert "123\n0ab" in outputs_contents assert "456\n0ab" in outputs_contents + # TODO: Once cross production (instead of linking inputs) is an option + # again redo test with these checks... + # self.assertEquals( len( outputs ), 4 ) + # assert "123\n0ab" in outputs_contents + # assert "456\n789" in outputs_contents @skip_without_tool( "cat1" ) def test_map_over_collection( self ): Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org