floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-master

Browse Source 
# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py
This commit is contained in:
Bruno Oliveira
2016-07-25 19:04:39 -03:00
parent 9cf09cda7b d911bfcb8a
commit c2864aba3d
18 changed files with 216 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/en/contents.rst
View File

@@ -19,6 +19,7 @@ Full pytest documentation
recwarn
cache
plugins
nose
backwards-compatibility
contributing

11
doc/en/nose.rst
View File

@@ -24,7 +24,7 @@ Supported nose Idioms
* setup and teardown at module/class/method level
* SkipTest exceptions and markers
* setup/teardown decorators
* yield-based tests and their setup
* ``yield``-based tests and their setup
* ``__test__`` attribute on modules/classes/functions
* general usage of nose utilities
@@ -51,5 +51,12 @@ Unsupported idioms / known issues
- nose-style doctests are not collected and executed correctly,
also doctest fixtures don't work.
- no nose-configuration is recognized
- no nose-configuration is recognized.
- ``yield``-based methods don't support ``setup`` properly because
the ``setup`` method is always called in the same class instance.
There are no plans to fix this currently because ``yield``-tests
are deprecated in pytest 3.0, with ``pytest.mark.parametrize``
being the recommended alternative.