Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 0b64442ed3d06bd7fdf9f0fbb53520d28e9332b9 https://github.com/galaxyproject/galaxy/commit/0b64442ed3d06bd7fdf9f0fbb5352... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: A test/functional/known_broken_tools.txt M test/functional/test_toolbox_pytest.py Log Message: ----------- Skip tool tests in test/functional/known_broken_tools.txt Commit: 300ab73c10332968a98eb5f77a85abc66a3f4686 https://github.com/galaxyproject/galaxy/commit/300ab73c10332968a98eb5f77a85a... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M pytest.ini M test/functional/test_toolbox_pytest.py Log Message: ----------- Mark skipped tests instead of not collecting them Also marks tests as tool or data_manager, so `pytest -m <tool|data_manager>` can be used to select a subset of tests. Commit: 6f299202313c3b40d357468e9ba0e9b32f858038 https://github.com/galaxyproject/galaxy/commit/6f299202313c3b40d357468e9ba0e... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Use pytest for -framework, -installed, -data_manager, -migrated tests Commit: 546b90a6985cc6a8e4d87482778c8ac275c9903f https://github.com/galaxyproject/galaxy/commit/546b90a6985cc6a8e4d87482778c8... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Add additional test target for tools in tool_conf.xml.main Commit: e73257f8ed2556a94a6e58efff62ed1873709f42 https://github.com/galaxyproject/galaxy/commit/e73257f8ed2556a94a6e58efff62e... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M test/functional/test_toolbox_pytest.py Log Message: ----------- Set conda_auto_init and conda_auto_install to true for pytest driver Commit: 7f807ce971e8d743dca0f0438e5ce078f742ec65 https://github.com/galaxyproject/galaxy/commit/7f807ce971e8d743dca0f0438e5ce... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Fix shell syntax Commit: 9099e73a3e00658082891fae7ea3de0774cce2ad https://github.com/galaxyproject/galaxy/commit/9099e73a3e00658082891fae7ea3d... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M .coveragerc Log Message: ----------- Add include-ignored, otherwise spams stderr out Commit: d476fcc072dbcb8e3b19f511dc43ae731e7c97e0 https://github.com/galaxyproject/galaxy/commit/d476fcc072dbcb8e3b19f511dc43a... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M lib/galaxy/jobs/runners/util/kill.py Log Message: ----------- Fix LocalShell on python3 Commit: 1c64cdd674fcbfc0f077f5d31947dd9b6c6e9149 https://github.com/galaxyproject/galaxy/commit/1c64cdd674fcbfc0f077f5d31947d... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M pytest.ini M run_tests.sh M tox.ini Log Message: ----------- Use pytest to run unit and doctests Commit: 1152a19fd2cd5d6589becde3c7ebdd6435a33cff https://github.com/galaxyproject/galaxy/commit/1152a19fd2cd5d6589becde3c7ebd... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Use pytest-cov for testing coverage Commit: 66c64ccfe46cfd91bcffabaf2b4bddd7b86cef91 https://github.com/galaxyproject/galaxy/commit/66c64ccfe46cfd91bcffabaf2b4bd... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M test/unit/jobs/dynamic_tool_destination/test_dynamic_tool_destination.py Log Message: ----------- Adapt dynamic_tool_destination unit tests to pytest as driver The log capturing seems to be a bit different Commit: d9a2c5a970aafabe101842991a34074701f8854c https://github.com/galaxyproject/galaxy/commit/d9a2c5a970aafabe101842991a340... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Don't test tools in tool_conf.xml.sample as part of -framework This replicates what the FrameworkToolsGalaxyTestDriver does. Commit: aa0becad0be33ee7fe1d430c64f1d89f475ca6e2 https://github.com/galaxyproject/galaxy/commit/aa0becad0be33ee7fe1d430c64f1d... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-08-25 (Sat, 25 Aug 2018) Changed paths: M run_tests.sh Log Message: ----------- Simplify tool_conf selection in run_tests.sh Drops -with_framework_test_tools altogether. Thanks @nsoranzo. Commit: 8148bd91deb4d4f9b621b6e3097ae0f01ba81abd https://github.com/galaxyproject/galaxy/commit/8148bd91deb4d4f9b621b6e3097ae... Author: John Chilton <jmchilton@gmail.com> Date: 2018-09-05 (Wed, 05 Sep 2018) Changed paths: M .coveragerc M lib/galaxy/jobs/runners/util/kill.py M pytest.ini M run_tests.sh A test/functional/known_broken_tools.txt M test/functional/test_toolbox_pytest.py M test/unit/jobs/dynamic_tool_destination/test_dynamic_tool_destination.py M tox.ini Log Message: ----------- Merge pull request #6638 from mvdbeek/move_tests_to_pytest_setup Move tests to pytest setup Compare: https://github.com/galaxyproject/galaxy/compare/bc1526ab2dd5...8148bd91deb4 **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.