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

..

assertion

Merge branch 'pytest-2.7'

2015-06-23 16:49:05 +02:00

__init__.py

bump version to 2.7, depend on py-1.4.29

2015-06-22 23:53:41 +02:00

_argcomplete.py

complete_dotted: fix for #361, filecompleter on dot files had differing behaviour from bash

2013-10-01 16:33:15 +02:00

capture.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

config.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

doctest.py

merge conftest management into PytestPluginManager

2015-04-22 14:15:42 +02:00

genscript.py

- some more adaptation to most recent pluggy API

2015-05-05 21:53:04 +02:00

helpconfig.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

hookspec.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

impl

- enhance ordering of tests using parametrized resources

2012-08-01 09:07:32 +02:00

junitxml.py

Merge branch 'pytest-2.7'

2015-06-17 13:42:41 +02:00

main.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

mark.py

remove shutdown logic from PluginManager and add a add_cleanup() API

2015-04-22 16:33:20 +02:00

monkeypatch.py

Fix monkeypatch.setenv with string and raising=False.

2015-05-19 22:59:49 +02:00

nose.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

pastebin.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

pdb.py

Introduce pytest_enter_pdb hook

2014-09-18 14:58:42 +02:00

pytester.py

Make "running" output from testdir.run copy/pastable

2015-05-09 10:24:33 -03:00

python.py

Merge branch 'pytest-2.7'

2015-06-23 16:49:05 +02:00

recwarn.py

Removing py.std usage from _pytest

2014-07-31 19:13:40 -03:00

resultlog.py

Use os.path.isdir instead of os.path.exists

2015-06-17 08:08:03 -03:00

runner.py

allow postmortem debugging on failed test

2015-03-21 09:26:35 +01:00

skipping.py

Merge remote-tracking branch 'origin/pytest-2.7'

2015-06-19 10:03:37 +02:00

standalonetemplate.py

Added explanation for the binary blob in runtests.py

2014-10-24 13:04:20 +02:00

terminal.py

Use platform.python_version() to show Python version number

2015-05-31 20:31:31 +01:00

tmpdir.py

Removing py.std usage from _pytest

2014-07-31 19:13:40 -03:00

unittest.py

Merge remote-tracking branch 'origin/pytest-2.7'

2015-06-19 10:03:37 +02:00