holger krekel cb58eaa611 Merge remote-tracking branch 'upstream/master' into features ...

Conflicts:
	_pytest/__init__.py
	testing/test_recwarn.py

2015-09-29 15:56:41 +02:00

..

assertion

#877 - reencoding causes typeerrors on python2

2015-09-19 00:30:01 +02:00

vendored_packages

Vendor pluggy-0.3.1

2015-09-27 16:04:29 -03:00

__init__.py

start 2.8.2 development

2015-09-29 15:32:33 +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

_pluggy.py

Create _pytest.vendored_packages and _pytest._pluggy

2015-09-07 13:01:54 -03:00

cacheprovider.py

Add docstring to cache fixture

2015-09-22 23:46:05 -03:00

capture.py

Don't hardcode 'std' for captured stdout/stderr.

2015-09-22 20:29:16 +02:00

config.py

Add missing nodeid on pytest_logwarning call in addhook.

2015-09-28 20:23:54 -04:00

doctest.py

Make doctest SKIP option register doctests as SKIPPED rather than PASSED

2015-08-31 21:25:11 -03:00

genscript.py

revert setuptools_scm addition introduced with f22d14b105

2015-09-17 12:58:04 +02:00

helpconfig.py

replay initial warnings when terminalreporter is loaded

2015-08-31 21:54:12 +02:00

hookspec.py

Merge pull request #974 from nicoddemus/addoption-conftest

2015-09-21 11:28:31 +01:00

impl

- enhance ordering of tests using parametrized resources

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

junitxml.py

Fix xml generation when used with pytest-xdist

2015-09-26 03:21:24 -03:00

main.py

restrucure pytest.main.wrap_session to allow for non-testrun wraps

2015-09-14 18:34:29 +02:00

mark.py

Issue #751 - fix.

2015-07-25 15:38:27 +02:00

monkeypatch.py

Merge pull request #1015 from hpk42/cache-integration

2015-09-16 21:46:46 +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

- fix a flaky test on py35-xdist by calling

2015-09-29 13:10:59 +02:00

python.py

seems like pypy's callable builtin calls __getattr__ so we do the check

2015-09-28 14:02:30 +02:00

recwarn.py

Merge remote-tracking branch 'upstream/master' into features

2015-09-29 15:56:41 +02:00

resultlog.py

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

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

runner.py

Don't hardcode 'std' for captured stdout/stderr.

2015-09-22 20:29:16 +02:00

skipping.py

Merge branch 'pytest-2.7'

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

standalonetemplate.py

setuptools not present issue deprecating gentest

2015-07-25 13:50:40 +02:00

terminal.py

(w)warnings -> (w)pytest-warnings in "-r chars" help

2015-09-23 01:09:09 -03:00

tmpdir.py

Make tmpdir resiliant to user ids that do not exist

2015-09-18 21:26:19 -04:00

unittest.py

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

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