Bruno Oliveira 1e0cf5ce4d Merge remote-tracking branch 'upstream/master' into merge-master-into-features ...

# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py

2017-03-10 15:54:05 -03:00

..

approx.py

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

collect.py

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

2017-03-10 15:54:05 -03:00

fixture.py

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

integration.py

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

metafunc.py

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

raises.py

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

setup_only.py

Implement --setup-show cli flag

2016-07-03 22:30:51 +02:00

setup_plan.py

Improve commenting for setupplan unittest.

2016-06-25 12:21:31 +02:00

show_fixtures_per_test.py

Change format for test function locations

2016-06-12 15:58:32 +01:00