Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 7269f76e6e8227d26c928e76cd81941498c0acd7 https://github.com/galaxyproject/galaxy/commit/7269f76e6e8227d26c928e76cd819... Author: John Chilton jmchilton@gmail.com Date: 2015-12-26 (Sat, 26 Dec 2015)

Changed paths: M test/functional/tools/samples_tool_conf.xml

Log Message: ----------- Remove transiently failing maxseconds.xml framework test.

Commit: 79bbc97a189bea03392bff2ab6a819aca1fad0db https://github.com/galaxyproject/galaxy/commit/79bbc97a189bea03392bff2ab6a81... Author: John Chilton jmchilton@gmail.com Date: 2015-12-26 (Sat, 26 Dec 2015)

Changed paths: M test/tool_shed/base/twilltestcase.py

Log Message: ----------- Attempt to fix transiently failing capsule TS test.

Guess here is that a flush is not occuring on that file because it is happening as part of garbage collection and not explictly as part of an explicit close.

Commit: 14a618ee3ab084e43f51f72136afd6b4c482b4cf https://github.com/galaxyproject/galaxy/commit/14a618ee3ab084e43f51f72136afd... Author: Martin Cech cech.marten@gmail.com Date: 2015-12-28 (Mon, 28 Dec 2015)

Changed paths: M test/functional/tools/samples_tool_conf.xml M test/tool_shed/base/twilltestcase.py

Log Message: ----------- Merge pull request #1401 from jmchilton/transient_tests_2

Fix and potential fix for transiently failing tests.

Compare: https://github.com/galaxyproject/galaxy/compare/798c7e20c338...14a618ee3ab0