3 Commits

Author	SHA1	Message	Date
Anthony Sottile	af6548a4e7	Merge pull request #7244 from DahlitzFlorian/fix-issue-7150 ... Prevent hiding underlying exception when ConfTestImportFailure is raised (cherry picked from commit 45f53266e6)	2020-05-23 12:13:34 -07:00
Bruno Oliveira	93b74d28d2	Merge remote-tracking branch 'upstream/master' into mm ... Conflicts: * src/_pytest/_code/code.py * src/_pytest/main.py * testing/python/metafunc.py * testing/test_parseopt.py * testing/test_pytester.py	2020-01-22 11:03:45 -03:00
Ronny Pfannschmidt	8feeb09398	fixes #5065	2019-11-27 11:25:23 +01:00