Brianna Laugher 40fa7b25c5 Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master ... Fixed merge conflict in CHANGELOG		2015-08-08 18:54:53 +02:00
..
collect.py	Document and test stacking of parametrize.	2015-07-26 14:39:13 +02:00
fixture.py	Merge branch 'pytest-2.7'	2015-07-23 22:35:51 -03:00
integration.py	change test module importing behaviour to append to sys.path	2015-04-17 22:25:35 +02:00
metafunc.py	Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master	2015-08-08 18:54:53 +02:00
raises.py	Added `warns` to assert warnings are thrown	2015-07-30 23:28:32 -04:00