holger krekel ee40ea5f6d Merge branch 'pytest-2.7' ... Conflicts: AUTHORS _pytest/__init__.py setup.py testing/conftest.py tox.ini		2015-06-23 16:49:05 +02:00
..
collect.py	adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts	2015-05-06 10:08:08 +02:00
fixture.py	use runpytest() instead of runpytest_inprocess if a test can run as subprocess as well	2015-04-28 12:05:08 +02:00
integration.py	change test module importing behaviour to append to sys.path	2015-04-17 22:25:35 +02:00
metafunc.py	use runpytest() instead of runpytest_inprocess if a test can run as subprocess as well	2015-04-28 12:05:08 +02:00
raises.py	Fix issue where pytest.raises() doesn't always return Exception instance in py26	2015-06-19 07:46:47 -03:00