Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3c20f3285a123a243eed57040da3966800ca2438 https://github.com/galaxyproject/galaxy/commit/3c20f3285a123a243eed57040da39... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-30 (Thu, 30 Nov 2017) Changed paths: M test/base/populators.py M test/functional/tools/sample_datatypes_conf.xml M test/integration/test_data_manager_table_reload.py Log Message: ----------- Attempt to make data manager integration test more robust. Increase the timeout - this test fails on Jenkins every now and then and reports the DM job is still queued. I assume this is because of conda_auto_install setting up the requirements for this data manager and the logs seem consistent with that assumption. I also added data manager json type to the sample so this warning goes away: ``` galaxy.model WARNING 2017-11-30 06:39:59,335 Datatype class not found for extension 'data_manager_json' ``` Commit: 3e7973940a67e30506973070ced00e471b914b31 https://github.com/galaxyproject/galaxy/commit/3e7973940a67e30506973070ced00... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2017-11-30 (Thu, 30 Nov 2017) Changed paths: M test/base/populators.py M test/functional/tools/sample_datatypes_conf.xml M test/integration/test_data_manager_table_reload.py Log Message: ----------- Merge pull request #5098 from jmchilton/reload_dm_test_robust Attempt to make data manager integration test more robust. Compare: https://github.com/galaxyproject/galaxy/compare/baba3417d08d...3e7973940a67