palaviv 7885e43b78 Merge remote-tracking branch 'upstream/features' into allow-none-as-parametrized-test-id		2016-03-20 18:57:17 +02:00
..
approx.py	Fix Decimal() and __ne__() errors.	2016-03-11 16:29:18 -08:00
collect.py	Fix decoding issue while formatting SyntaxErrors during collection	2016-03-05 16:58:50 -03:00
fixture.py	Allow custom fixture names for fixtures	2016-03-09 14:58:54 -08:00
integration.py	Moved py.code code over to py.test	2016-01-25 23:18:04 -02:00
metafunc.py	added test for unique names when recievieng identical ids in parametrize	2016-03-19 21:42:47 +02:00
raises.py	Add expected exceptions to 'DID NOT RAISE' msg	2016-02-03 14:12:41 +03:00