Bruno Oliveira c2864aba3d Merge branch 'master' into merge-master ...

# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py

2016-07-25 19:06:29 -03:00

..

_code

Remove assertion reinterpretation

2016-07-15 00:33:39 +01:00

assertion

Remove assertion reinterpretation

2016-07-15 00:33:39 +01:00

vendored_packages

Fix spelling: explicitely --> explicitly

2015-12-01 01:41:47 -08:00

__init__.py

merge master into features

2016-06-22 14:39:33 +02:00

_argcomplete.py

Remove code related to support python <= 2.5

2015-12-16 16:16:22 -02:00

_pluggy.py

Create _pytest.vendored_packages and _pytest._pluggy

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

cacheprovider.py

Use testscollected to make xdist happy

2016-03-11 14:48:17 +06:00

capture.py

Merge branch 'master' into merge-master

2016-07-25 19:06:29 -03:00

compat.py

split most fixture related code into own plugin

2016-07-09 20:36:00 +02:00

config.py

feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths.

2016-07-25 12:41:58 +02:00

debugging.py

Add tests for custom pdb class.

2016-07-11 20:07:29 -07:00

doctest.py

Changes variable name so it better describes what it does now.

2016-07-23 16:26:33 +02:00

fixtures.py

Merge branch 'master' into merge-master

2016-07-25 19:06:29 -03:00

freeze_support.py

Move the freezing function from genscript.py to a new module freeze_support.py

2016-06-26 19:37:24 +02:00

helpconfig.py

Followup to #1718: style/formatting

2016-07-24 00:21:42 +02:00

hookspec.py

Switch setuponly and setupplan options to a hook-based implementation.

2016-06-25 12:19:46 +02:00

impl

- enhance ordering of tests using parametrized resources

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

junitxml.py

Merge branch 'master' into merge-master

2016-07-25 19:06:29 -03:00

main.py

Merge branch 'master' into merge-master

2016-07-25 19:06:29 -03:00

mark.py

Always lstrip() keyword expression

2016-04-01 13:10:05 -04:00

monkeypatch.py

Merge branch 'master' into merge-master

2016-07-25 19:06:29 -03: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

Fix pastebin when captured output contains non-ascii characters

2015-12-03 20:07:18 -02:00

pytester.py

Log LineMatcher output in a stream instead of stderr

2016-07-20 22:35:43 -03:00

python.py

Merge branch 'master' into merge-master

2016-07-25 19:06:29 -03:00

recwarn.py

Moved py.code code over to py.test

2016-01-25 23:18:04 -02:00

resultlog.py

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

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

runner.py

Implement --setup-show cli flag

2016-07-03 22:30:51 +02:00

setuponly.py

Fix PEP-8.

2016-07-03 22:33:21 +02:00

setupplan.py

Fix PEP-8.

2016-07-03 22:33:21 +02:00

skipping.py

skipping plugin: remove python2.5 compat code

2016-07-20 17:45:20 +02:00

terminal.py

Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default

2016-07-13 18:45:15 -03:00

tmpdir.py

Merge branch 'master' into merge-master

2016-07-25 19:06:29 -03:00

unittest.py

unittest.UnitTestCase: Allow __test__ for methods

2016-05-19 08:19:57 +05:30