1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/commits/c49801c86150/
Changeset: c49801c86150
User: hpk42
Date: 2014-07-28 09:59:22
Summary: address issue170 by merging David Mohr's PR on adding "raises" as
an optional
argument to pytest.mark.xfail.
Affected #: 4 files
diff -r 3decf8c96e3c85b722302a2618b088ed93a8628a -r
c49801c86150891478719d8ca94505da2cf3f4e8 AUTHORS
--- a/AUTHORS
+++ b/AUTHORS
@@ -43,3 +43,4 @@
Daniel Grana
Andy Freeland
Trevor Bekolay
+David Mohr
diff -r 3decf8c96e3c85b722302a2618b088ed93a8628a -r
c49801c86150891478719d8ca94505da2cf3f4e8 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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).
diff -r 3decf8c96e3c85b722302a2618b088ed93a8628a -r
c49801c86150891478719d8ca94505da2cf3f4e8 _pytest/__init__.py
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
#
-__version__ = '2.6.0'
+__version__ = '2.6.1.dev1'
diff -r 3decf8c96e3c85b722302a2618b088ed93a8628a -r
c49801c86150891478719d8ca94505da2cf3f4e8 setup.py
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@
name='pytest',
description='pytest: simple powerful testing with Python',
long_description=long_description,
- version='2.6.0',
+ version='2.6.1.dev1',
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
