Bruno Oliveira df29120abe Merge branch 'pytest-2.7' ...

Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini

2015-07-23 22:35:51 -03:00

..

collect.py

Merge branch 'pytest-2.7'

2015-07-19 15:25:04 +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

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