address issue170 by merging David Mohr's PR on adding "raises" as an optional · c2ed29070a - pytest2 - Trustie: Git with trustie

floraachy/pytest2

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

									
										_pytest/__init__.py
									
		+1
		-1
	
												View File
												
				@@ -1,2 +1,2 @@

				#

				__version__ = '2.6.0'

				__version__ = '2.6.1.dev1'