Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 53f1782964d0fe447582d6f04a87ef0d6d8c5455 https://github.com/galaxyproject/galaxy/commit/53f1782964d0fe447582d6f04a87e... Author: John Chilton <jmchilton@gmail.com> Date: 2016-04-04 (Mon, 04 Apr 2016) Changed paths: M run_tests.sh M test/base/driver_util.py Log Message: ----------- Allow setting job_conf path for functional tests. Commit: 7aa2d6840a8d0094c89a53cef06423701b677211 https://github.com/galaxyproject/galaxy/commit/7aa2d6840a8d0094c89a53cef0642... Author: John Chilton <jmchilton@gmail.com> Date: 2016-04-04 (Mon, 04 Apr 2016) Changed paths: M scripts/functional_tests.py M test/base/driver_util.py A test/base/integration_util.py A test/integration/__init__.py A test/integration/embedded_pulsar_job_conf.xml A test/integration/test_pulsar_embedded.py Log Message: ----------- Implement IntegrationTestCase and EmbeddedPulsarTestCase. IntegrationTestCases differ from functional tests in that they start up a Galaxy instance configured on a per test class basis - so this new class of "integration tests" can test configuration modalities of Galaxy that cannot be tested with traditional Galaxy functional tests. Commit: 40e123b84b6825882f9172c212258e809bd73961 https://github.com/galaxyproject/galaxy/commit/40e123b84b6825882f9172c212258... Author: John Chilton <jmchilton@gmail.com> Date: 2016-04-04 (Mon, 04 Apr 2016) Changed paths: M config/job_conf.xml.sample_advanced Log Message: ----------- Fixup embedded Pulsar job runner based on @mvdbeek's comments. Commit: bdb41005c82678933656d651484cd1b9efeb55d1 https://github.com/galaxyproject/galaxy/commit/bdb41005c82678933656d651484cd... Author: John Chilton <jmchilton@gmail.com> Date: 2016-04-04 (Mon, 04 Apr 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/runners/pulsar.py Log Message: ----------- Fix pulsar_conf/pulsar_config problem. One was being validated and the other was being read and documented. Commit: 2bd4de2025e55a9fc02ed3f74fbf297279e9d04f https://github.com/galaxyproject/galaxy/commit/2bd4de2025e55a9fc02ed3f74fbf2... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-04-05 (Tue, 05 Apr 2016) Changed paths: M test/integration/__init__.py M test/integration/embedded_pulsar_job_conf.xml Log Message: ----------- Fix things found by @mvdbeek Commit: d6d216c92efb973c9f03772fdab7ac51a3688692 https://github.com/galaxyproject/galaxy/commit/d6d216c92efb973c9f03772fdab7a... Author: Nate Coraor <nate@bx.psu.edu> Date: 2016-04-05 (Tue, 05 Apr 2016) Changed paths: M config/job_conf.xml.sample_advanced M lib/galaxy/jobs/runners/pulsar.py M run_tests.sh M scripts/functional_tests.py M test/base/driver_util.py A test/base/integration_util.py A test/integration/__init__.py A test/integration/embedded_pulsar_job_conf.xml A test/integration/test_pulsar_embedded.py Log Message: ----------- Merge pull request #2078 from jmchilton/embed_dev Enhancements for Pulsar Embedded Runner Compare: https://github.com/galaxyproject/galaxy/compare/8d703e30a029...d6d216c92efb