Bruno Oliveira 1266ebec83 Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default ...

# Conflicts:
#	CHANGELOG.rst
#	testing/test_terminal.py

2016-07-13 18:45:15 -03:00

..

code

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00

cx_freeze

merge from master to features

2016-07-06 11:51:48 +02:00

python

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00

acceptance_test.py

funcarg_prefix_warning: remove newline

2016-07-13 18:33:24 +02:00

test_argcomplete.py

Remove code related to support python <= 2.5

2015-12-16 16:16:22 -02:00

test_assertinterpret.py

Moved py.code code over to py.test

2016-01-25 23:18:04 -02:00

test_assertion.py

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00

test_assertrewrite.py

merge from master to features

2016-07-06 11:51:48 +02:00

test_cache.py

LastFailed now creates .cache only when needed. Fixes #1342

2016-02-16 11:42:04 +06:00

test_capture.py

Add disabled() method to capsys and capfd

2016-06-19 19:14:36 +02:00

test_collection.py

merge master into features

2016-06-22 14:39:33 +02:00

test_config.py

Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default

2016-07-13 18:45:15 -03:00

test_conftest.py

Moved py.code code over to py.test

2016-01-25 23:18:04 -02:00

test_doctest.py

merge master into features

2016-06-22 14:39:33 +02:00

test_entry_points.py

Add tests to make sure expected entry points exist (#1629)

2016-06-22 14:28:53 +02:00

test_helpconfig.py

Introduce pytest command as recommended entry point

2016-06-21 16:16:57 +02:00

test_junitxml.py

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00

test_mark.py

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00

test_monkeypatch.py

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00

test_nose.py

Remove code related to support python <= 2.5

2015-12-16 16:16:22 -02:00

test_parseopt.py

merge from master to features

2016-07-06 11:51:48 +02:00

test_pastebin.py

Fix pastebin when captured output contains non-ascii characters

2015-12-03 20:07:18 -02:00

test_pdb.py

Merge pull request #1712 from anntzer/custom-debugger

2016-07-12 16:45:07 +02:00

test_pluginmanager.py

Improve error message when a plugin fails to import

2016-03-08 19:18:13 -03:00

test_pytester.py

streamline pytester API majorly:

2015-04-28 11:54:53 +02:00

test_recwarn.py

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2015-12-10 19:41:14 -02:00

test_resultlog.py

Raise CollectError if pytest.skip() is called during collection

2016-06-24 20:56:21 +02:00

test_runner_xunit.py

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00

test_runner.py

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00

test_session.py

Raise CollectError if pytest.skip() is called during collection

2016-06-24 20:56:21 +02:00

test_skipping.py

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00

test_terminal.py

Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default

2016-07-13 18:45:15 -03:00

test_tmpdir.py

fix flaky get_user fallback tests

2015-09-29 21:00:12 +02:00

test_unittest.py

Replace all usages of "pytest_funcarg__" for @pytest.fixture

2016-07-11 22:21:52 -03:00