66 Commits

Author	SHA1	Message	Date
turturica	4d3c1ab4f0	Fixes #3854	2018-08-22 21:42:59 -07:00
turturica	e4f76f6350	Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854	2018-08-22 20:36:52 -07:00
Bruno Oliveira	64faa41d06	Merge pull request #3802 from jonozzz/fix-3768 ... Fix test collection from packages mixed with directories. #3768 and #3789	2018-08-15 21:42:25 -03:00
Josh Holland	abbd7c30a4	Unhide documentation for metafunc.config ... Fixes #3746.	2018-08-11 20:48:55 +01:00
turturica	bfd0addaeb	Fix test collection from packages mixed with directories. #3768 and #3789	2018-08-10 12:56:08 -07:00
turturica	d0bd01beca	Collect any tests from a package's __init__.py	2018-08-09 18:06:38 -07:00
Bruno Oliveira	fe0a76e1a6	Fix recursion bug if a pytest_ignore_collect returns False instead of None	2018-08-03 15:40:33 -03:00
Bruno Oliveira	ac9ceaacd8	Merge remote-tracking branch 'upstream/master' into merge-master-into-features	2018-07-15 11:54:14 -03:00
Bruno Oliveira	3e599dc149	Check that param sets match number of args during _for_parametrize ... It makes sense to validate them during creation of the parameter set	2018-07-11 22:57:53 -03:00
Bruno Oliveira	54fbc6f6e1	Refactor parametrize() code for readability ... Extract the parametrize() block of code into methods for better readability	2018-07-11 21:29:21 -03:00
Bruno Oliveira	3c19370cec	Merge remote-tracking branch 'upstream/features' into jonozzz/features	2018-07-05 18:15:17 -03:00
Serhii Mozghovyi	1dc5e97ac2	Make test parametrization override indirect fixtures	2018-06-28 14:32:29 +03:00
Ronny Pfannschmidt	b8486037d3	fix #3605 - unpack markdecorators from parameterization	2018-06-26 21:57:31 +02:00
Anthony Sottile	cbaa7dd56a	Upgrade pre-commit hooks except pyupgrade	2018-06-26 06:35:27 -07:00
Bruno Oliveira	93e55ad2fa	Remove unused attribute and parameter in CallSpec2	2018-06-18 21:48:49 -03:00
Ronny Pfannschmidt	eaa882f3d5	switch to src layout	2018-05-26 09:10:38 +02:00