Branch: refs/heads/release_15.10 Home: https://github.com/galaxyproject/galaxy Commit: f042fe8548ec4a0f2f29b72d0c34736e2ff524f9 https://github.com/galaxyproject/galaxy/commit/f042fe8548ec4a0f2f29b72d0c347... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-18 (Fri, 18 Dec 2015) Changed paths: M test/api/test_jobs.py Log Message: ----------- Attempt to fix transiently failing API tests. - Fix default timeout of wait_on_state api helper. Had the wrong default specified and might fix this failure: https://jenkins.galaxyproject.org/job/docker-api/229/testReport/junit/api.te... - Modify job search test case to allow a little more time between the history being "ok" and the job, in case there is a timing condition if the HDA is committed first and then job. Also improve the test output in case this isn't the problem. Commit: 93c6d0542124c220e36c1e90d62e3e2aef607e9a https://github.com/galaxyproject/galaxy/commit/93c6d0542124c220e36c1e90d62e3... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-18 (Fri, 18 Dec 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: ffb973477b02c4bc1cbfa95c7a6247f1d7949fdd https://github.com/galaxyproject/galaxy/commit/ffb973477b02c4bc1cbfa95c7a624... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-18 (Fri, 18 Dec 2015) Changed paths: M scripts/functional_tests.py Log Message: ----------- Do not check for tool migrations when running tests. This is an inappropriate time for the check and causes slow down when running tests. Commit: 641b275aa424421591833f6a3bce3ebd8b358017 https://github.com/galaxyproject/galaxy/commit/641b275aa424421591833f6a3bce3... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-18 (Fri, 18 Dec 2015) Changed paths: M test/api/helpers.py M test/api/test_jobs.py Log Message: ----------- Wait on jobs and history in certain API test cases. This strategy proved to work around certain race conditions in tool testing so hopefully it will solve the transiently failing job searching and filtering test cases. Commit: 57a76065a54f63a47874158c121f002308648025 https://github.com/galaxyproject/galaxy/commit/57a76065a54f63a47874158c121f0... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-18 (Fri, 18 Dec 2015) Changed paths: M test/api/helpers.py Log Message: ----------- Fix missing assertion pointed out @nsoranzo. Lots of other tests would fail if simple uploads aren't working, but it is better to be direct and very explicit about why this particular test is failing. Commit: 2817eabf95a980a250e272c3917e5dcfc24743b2 https://github.com/galaxyproject/galaxy/commit/2817eabf95a980a250e272c3917e5... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-18 (Fri, 18 Dec 2015) Changed paths: M test/functional/tools/maxseconds.xml Log Message: ----------- Fail maxseconds test tool if sleep is interrupted. Commit: 5d26f589cc475ff95b97ef2dcb34d5a290079e8b https://github.com/galaxyproject/galaxy/commit/5d26f589cc475ff95b97ef2dcb34d... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-12-22 (Tue, 22 Dec 2015) Changed paths: M lib/galaxy/tools/parser/xml.py M lib/galaxy/tools/test.py M scripts/functional_tests.py M test/api/helpers.py M test/api/test_jobs.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 #1295 from jmchilton/test_fixes_backport_15_10 [15.10] Backport various testing fixes. Compare: https://github.com/galaxyproject/galaxy/compare/52b66d0dee8c...5d26f589cc47