address issue170 by merging David Mohr's PR on adding "raises" as an optional

argument to pytest.mark.xfail.
This commit is contained in:
holger krekel 2014-07-28 09:59:22 +02:00
parent 38104dfc92
commit c2ed29070a
4 changed files with 13 additions and 3 deletions

View File

@ -43,3 +43,4 @@ Christopher Gilling
Daniel Grana Daniel Grana
Andy Freeland Andy Freeland
Trevor Bekolay Trevor Bekolay
David Mohr

View File

@ -1,4 +1,13 @@
NEXT (2.6) NEXT
-----------------------------------
- address issue170: allow pytest.mark.xfail(...) to specify expected exceptions via
an optional "raises=EXC" argument where EXC can be a single exception
or a tuple of exception classes. Thanks David Mohr for the complete
PR.
2.6
----------------------------------- -----------------------------------
- Cache exceptions from fixtures according to their scope (issue 467). - Cache exceptions from fixtures according to their scope (issue 467).

View File

@ -1,2 +1,2 @@
# #
__version__ = '2.6.0' __version__ = '2.6.1.dev1'

View File

@ -27,7 +27,7 @@ def main():
name='pytest', name='pytest',
description='pytest: simple powerful testing with Python', description='pytest: simple powerful testing with Python',
long_description=long_description, long_description=long_description,
version='2.6.0', version='2.6.1.dev1',
url='http://pytest.org', url='http://pytest.org',
license='MIT license', license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],