elizabeth e67d66a5d4 Merge branch 'pytest-dev' ... # Conflicts: # AUTHORS		2015-08-24 22:55:11 +03:00
..
collect.py	return non-zero exit code if no tests are collected	2015-08-18 07:35:02 -03:00
fixture.py	Don't skip fixtures that are substrings of params	2015-08-11 00:41:21 +02: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 'pytest-dev'	2015-08-24 22:55:11 +03:00
raises.py	Added `warns` to assert warnings are thrown	2015-07-30 23:28:32 -04:00