Files
galaxy/test/functional
John Chilton 3c20f3285a 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'
```
2017-11-30 06:41:12 -05:00
..
2017-11-14 19:42:39 +00:00