Daniel Hahler 7f1af84f47 Merge master into features ... Conflicts: src/_pytest/logging.py		2019-10-27 02:06:36 +01:00
..
approx.py	Drop python 2 unicode tests for approx repr	2019-10-24 23:44:13 -04:00
collect.py	Merge master into features	2019-10-27 02:06:36 +01:00
fixtures.py	Merge master into features	2019-10-18 17:51:42 +02:00
integration.py	copy test and changelog from #5607 by @niccodemus	2019-07-20 20:21:27 +02:00
metafunc.py	refactor resolve_arg_value_types	2019-07-13 08:13:46 +02:00
raises.py	Fix coverage	2019-08-20 15:41:32 +03:00
show_fixtures_per_test.py	Use new no-match functions to replace previous idiom	2019-10-06 18:05:24 -03:00