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

..

cx_freeze

Fix py27-cxfreeze tox environment

2015-04-22 19:46:06 -03:00

python

Merge branch 'pytest-2.7'

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

acceptance_test.py

streamline pytester API majorly:

2015-04-28 11:54:53 +02:00

test_argcomplete.py

ignore argcomplete on darwin

2013-11-12 13:52:16 +01:00

test_assertinterpret.py

assert reinterpretation: try mangling attributes that look like private class vars (fixes #514)

2014-05-31 14:37:02 -07:00

test_assertion.py

Merge branch 'pytest-2.7'

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

test_assertrewrite.py

Merge fix for issue 731 from pytest-2.7

2015-04-30 21:13:03 +01:00

test_capture.py

streamline pytester API majorly:

2015-04-28 11:54:53 +02:00

test_collection.py

streamline pytester API majorly:

2015-04-28 11:54:53 +02:00

test_config.py

adapt pytest to pluggy's decoratorclass branch

2015-04-29 16:40:52 +02:00

test_conftest.py

Merge branch 'pytest-2.7'

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

test_doctest.py

backport fix for #713

2015-06-16 21:27:22 -03:00

test_genscript.py

- refine lsof checking

2015-04-28 11:54:46 +02:00

test_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

test_junitxml.py

Merge branch 'pytest-2.7'

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

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

test_monkeypatch.py

Change links from bitbucket to GitHub

2015-06-15 18:28:31 -03:00

test_nose.py

use runpytest() instead of runpytest_inprocess if a test can run as subprocess as well

2015-04-28 12:05:08 +02:00

test_parseopt.py

Simply show the node ID for verbose output

2014-08-01 00:29:35 +01:00

test_pastebin.py

Fixing --pastebin option by using a POST request instead of a XMLRPC call

2014-10-22 21:52:40 -02:00

test_pdb.py

streamline pytester API majorly:

2015-04-28 11:54:53 +02:00

test_pluginmanager.py

adapt pytest to using pluggy (current master)

2015-04-29 16:40:51 +02:00

test_pytester.py

streamline pytester API majorly:

2015-04-28 11:54:53 +02:00

test_recwarn.py

avoid undocumented special casing of "pytest_" prefix

2015-04-22 13:44:37 +02:00

test_resultlog.py

Add docs for new tests

2015-06-17 00:04:25 -03:00

test_runner_xunit.py

ref #322 cleanup all teardown calling to only happen when setup succeeded.

2013-08-02 09:52:40 +02:00

test_runner.py

address reviewer comments

2015-03-21 17:26:23 +01:00

test_session.py

- refine lsof checking

2015-04-28 11:54:46 +02:00

test_skipping.py

Skipif marker report now refers to the skipped function

2015-06-18 21:59:44 -03:00

test_terminal.py

use new pluggy api (now at 0.3.0) for adding hookcall monitoring

2015-05-07 11:02:55 +02:00

test_tmpdir.py

refine skipif to use direct booleans, to help with flakes

2014-01-29 11:46:36 +01:00

test_unittest.py

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

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