Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: f34bb5e1f66e47ae13396f8ab8d8336aa635a255 https://github.com/galaxyproject/galaxy/commit/f34bb5e1f66e47ae13396f8ab8d83... Author: John Chilton jmchilton@gmail.com Date: 2016-12-24 (Sat, 24 Dec 2016)

Changed paths: M lib/galaxy/config.py M test/base/driver_util.py

Log Message: ----------- Don't override Global tempfile.tmpdir for tests.

Tests may bring up multiple Galaxy instances - for integration tests this leads to a longer temp path with each new Galaxy instance brought up. This in turn breaks Conda for tests on Jenkins.

Commit: a0aa70baa0573ff891f51f3ffbc29e07dcf970a5 https://github.com/galaxyproject/galaxy/commit/a0aa70baa0573ff891f51f3ffbc29... Author: John Chilton jmchilton@gmail.com Date: 2016-12-24 (Sat, 24 Dec 2016)

Changed paths: M test/integration/test_job_resubmission.py

Log Message: ----------- Fix broken integration test.

It was simply checking the wrong condition.

Commit: 261524e57fd353267016cfce3a7ca8de2b27d89c https://github.com/galaxyproject/galaxy/commit/261524e57fd353267016cfce3a7ca... Author: Björn Grüning bjoern@gruenings.eu Date: 2016-12-26 (Mon, 26 Dec 2016)

Changed paths: M lib/galaxy/config.py M test/base/driver_util.py M test/integration/test_job_resubmission.py

Log Message: ----------- Merge pull request #3365 from jmchilton/integration_tests_1

Attempt to fix broken integration tests on Jenkins.

Compare: https://github.com/galaxyproject/galaxy/compare/58c1828c4c26...261524e57fd3