Bruno Oliveira 9f94e443ff Merge remote-tracking branch 'upstream/pytest-2.7' ...

Conflicts:
	testing/conftest.py

2015-07-24 19:24:21 -03:00

..

assertion

Style fix

2015-07-18 13:18:38 -03: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

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

2015-07-24 19:24:21 -03:00

doctest.py

Consider session fixtures for doctest docstrings in modules

2015-07-13 12:29:09 -03:00

genscript.py

Merge branch 'pytest-2.7'

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

helpconfig.py

Merge branch 'pytest-2.7'

2015-07-23 22:35:51 -03: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

Add file and line attributes to junit-xml output.

2015-07-02 18:41:52 -04:00

main.py

Move Interrupted exception class out of Session

2015-07-18 13:16:47 -03:00

mark.py

Merge branch 'pytest-2.7'

2015-07-23 22:35:51 -03: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

Merge branch 'pytest-2.7'

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

pdb.py

Fix flakes

2015-07-18 18:23:17 -03:00

pytester.py

Use a subdirectory in the TEMP directory to speed up tmpdir creation

2015-07-15 20:03:58 -03:00

python.py

Merge branch 'pytest-2.7'

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

recwarn.py

deprecated_call dit not revert functions back to original

2015-06-25 17:11:50 +02:00

resultlog.py

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

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

runner.py

importorskip: Allow non-integer version strings

2015-07-24 12:34:06 -04:00

skipping.py

Merge branch 'pytest-2.7'

2015-07-19 15:25:04 +02:00

standalonetemplate.py

Added explanation for the binary blob in runtests.py

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

terminal.py

Merge branch 'pytest-2.7'

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

tmpdir.py

Merge branch 'pytest-2.7'

2015-07-19 15:25:04 +02:00

unittest.py

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

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