Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: b25b8c3f243e87a196a6cb0fa23328ee7c7e26f7 https://github.com/galaxyproject/galaxy/commit/b25b8c3f243e87a196a6cb0fa2332... Author: John Chilton <jmchilton@gmail.com> Date: 2015-11-18 (Wed, 18 Nov 2015) Changed paths: M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/test.py M test/base/twilltestcase.py A test/functional/tools/maxseconds.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Revise and fix waiting for tool tests. - maxseconds on test tag stopped being respected at some point, fix that. - maxseconds on test tag stopped being parsed at some later point, fix that. - Revise default behavior so it can be overridden with yet another testing environment variable GALAXY_TEST_DEFAULT_WAIT. - Add test case to ensure there is no future regression of these behaviors. Commit: d2bab13fa92a87a3c4959d782ba0bf061ecf07db https://github.com/galaxyproject/galaxy/commit/d2bab13fa92a87a3c4959d782ba0b... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2015-11-19 (Thu, 19 Nov 2015) Changed paths: M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/test.py M test/base/twilltestcase.py A test/functional/tools/maxseconds.xml M test/functional/tools/samples_tool_conf.xml Log Message: ----------- Merge pull request #1119 from jmchilton/maxseconds Revise and fix waiting for tool tests. Compare: https://github.com/galaxyproject/galaxy/compare/7ab070e9df6e...d2bab13fa92a