test_ok1/testing
Bruno Oliveira f3b359f5b8 Merge remote-tracking branch 'upstream/master' into merge-master-into-features
# Conflicts:
#	_pytest/capture.py
#	_pytest/compat.py
#	_pytest/python.py
#	testing/python/collect.py
#	testing/test_mark.py
2017-05-03 19:04:53 -03:00
..
code Fix test in py26 that expected a floor division error message 2017-03-16 23:07:03 -03:00
freeze Use PyInstaller for freeze test env 2016-07-26 22:02:37 -03:00
python Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-05-03 19:04:53 -03:00
acceptance_test.py Verify hooks after collection completes 2017-04-11 21:55:12 -03:00
deprecated_test.py Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings 2017-03-20 19:59:05 -03:00
test_argcomplete.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_assertion.py Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings 2017-03-20 19:59:05 -03:00
test_assertrewrite.py Ensure rewritten modules don't inherit __future__ flags from pytest 2017-04-06 15:00:36 -03:00
test_cache.py Improve --lf/--ff test as commented during review 2017-04-11 17:55:55 -03:00
test_capture.py Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-05-03 19:04:53 -03:00
test_collection.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_compat.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_config.py Clean up warnings generated by pytest's own suite 2017-03-20 22:13:17 -03:00
test_conftest.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_doctest.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_entry_points.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_helpconfig.py Fix test that expected "unknown hook" error on stderr 2017-04-11 21:55:12 -03:00
test_junitxml.py Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings 2017-03-20 19:59:05 -03:00
test_mark.py Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-05-03 19:04:53 -03:00
test_modimport.py add a comment explaining the modimport tests 2017-03-28 11:45:06 +02:00
test_monkeypatch.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_nose.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_parseopt.py Clean up warnings generated by pytest's own suite 2017-03-20 22:13:17 -03:00
test_pastebin.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_pdb.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_pluginmanager.py Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings 2017-03-20 19:59:05 -03:00
test_pytester.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_recwarn.py Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings 2017-03-20 19:59:05 -03:00
test_resultlog.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_runner.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_runner_xunit.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_session.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_skipping.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_terminal.py Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings 2017-03-20 19:59:05 -03:00
test_tmpdir.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_unittest.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
test_warnings.py Improve warning representation in terminal plugin and fix tests 2017-03-16 21:57:32 -03:00