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
..
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-05-03 19:04:53 -03:00
fixture.py	Clean up warnings generated by pytest's own suite	2017-03-20 22:13:17 -03:00
integration.py	New-style classes implemented for python 2.7 - #2147	2017-02-16 20:28:17 +01:00
metafunc.py	Clean up warnings generated by pytest's own suite	2017-03-20 22:13:17 -03: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