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

isinstance() on exception value instead of comparing types, consolidate tests

Browse Source 
--HG--
branch : xfail-cause
This commit is contained in:
david@mcbf.net
2014-07-26 17:46:50 +02:00
parent 7b273b8577
commit 6a4492a22d
2 changed files with 17 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
_pytest/skipping.py
View File

@@ -62,14 +62,11 @@ class MarkEvaluator:
def wasvalid(self):
return not hasattr(self, 'exc')
def invalidraise(self, exctype):
def invalidraise(self, exc):
raises = self.get('raises')
if not raises:
return
if isinstance(raises, tuple):
return exctype not in raises
else:
return raises != exctype
return not isinstance(exc, raises)
def istrue(self):
try:
@@ -182,7 +179,7 @@ def pytest_runtest_makereport(__multicall__, item, call):
if not item.config.option.runxfail:
if evalxfail.wasvalid() and evalxfail.istrue():
if call.excinfo:
if evalxfail.invalidraise(call.excinfo.type):
if evalxfail.invalidraise(call.excinfo.value):
rep.outcome = "failed"
return rep
else: