Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4765f5876eddf8855395b9d1bd8dd82f19ab4ce5 https://github.com/galaxyproject/galaxy/commit/4765f5876eddf8855395b9d1bd8dd... Author: John Chilton jmchilton@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M lib/galaxy/tools/parser/xml.py A lib/galaxy/tools/verify/__init__.py A lib/galaxy/tools/verify/asserts/__init__.py A lib/galaxy/tools/verify/asserts/tabular.py A lib/galaxy/tools/verify/asserts/text.py A lib/galaxy/tools/verify/asserts/xml.py A lib/galaxy/tools/verify/test_data.py M test/api/test_tools.py M test/api/test_workflows.py R test/base/asserts/__init__.py R test/base/asserts/tabular.py R test/base/asserts/text.py R test/base/asserts/xml.py R test/base/test_data.py M test/base/twilltestcase.py M test/functional/test_toolbox.py A test/functional/tools/composite_output_tests.xml M test/functional/tools/samples_tool_conf.xml

Log Message: ----------- Enhancements to tool test output verification.

Refactor test verification into galaxy-lib-compat module.

- Refactor a bunch class methods in ``test.base.twilltestcase`` into module functions in ``galaxy.tools.verify``. - Move ``test.base.test_data`` to ``galaxy.tools.verify.test_data``. - Move ``test.base.asserts`` to ``galaxy.tools.verify.asserts``.

Remove duplication in execution of these methods between composite and normal test outputs. This also entailed reworking the parsing of the composite test outputs to bring them inline with normal outputs. In addition to simplify removing duplication, this means many more tests can be made over composite outputs - such as md5 checks and test assertions. I've added a new framework test tool to verify this.

Commit: b41e03994e48abfb15c375f43a5de0cf3605e462 https://github.com/galaxyproject/galaxy/commit/b41e03994e48abfb15c375f43a5de... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-05-25 (Wed, 25 May 2016)

Changed paths: M lib/galaxy/tools/parser/xml.py A lib/galaxy/tools/verify/__init__.py A lib/galaxy/tools/verify/asserts/__init__.py A lib/galaxy/tools/verify/asserts/tabular.py A lib/galaxy/tools/verify/asserts/text.py A lib/galaxy/tools/verify/asserts/xml.py A lib/galaxy/tools/verify/test_data.py M test/api/test_tools.py M test/api/test_workflows.py R test/base/asserts/__init__.py R test/base/asserts/tabular.py R test/base/asserts/text.py R test/base/asserts/xml.py R test/base/test_data.py M test/base/twilltestcase.py M test/functional/test_toolbox.py A test/functional/tools/composite_output_tests.xml M test/functional/tools/samples_tool_conf.xml

Log Message: ----------- Merge pull request #2409 from jmchilton/test_assertions_lib

Enhancements to tool test output verification.

Compare: https://github.com/galaxyproject/galaxy/compare/d72031869d9c...b41e03994e48