Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP Change outcome to 'passed' for xfail unless it's strict #1795

Merged
merged 17 commits into from
Aug 18, 2016
Merged

WIP Change outcome to 'passed' for xfail unless it's strict #1795

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4fc20d0
Change outcome to 'passed' for xfail unless it's strict
hackebrot Aug 5, 2016
10a6ed1
Update unittest test to expect failure for an unexpected success
hackebrot Aug 12, 2016
296f42a
Treat unittest.expectedFailure pass as a failure
hackebrot Aug 12, 2016
14a4dd0
Extend test to verify longrepr in stdout
hackebrot Aug 12, 2016
225341c
Set wasxfail only for xpass w/o strict and else set longrepr
hackebrot Aug 12, 2016
55ec1d7
Update test_junitxml.py to interpret XPASS as passed
hackebrot Aug 15, 2016
ea379e0
Fix test in test_junitxml and add one for strict
hackebrot Aug 17, 2016
018197d
Fix broken test in test_skipping and add one for strict xfail
hackebrot Aug 17, 2016
bb3d6d8
Merge branch 'master' into fix-report-outcome-for-xpass
hackebrot Aug 17, 2016
d1f2f77
Use a better xfail reason
hackebrot Aug 17, 2016
767c28d
Fix broken test in test_junitxml
hackebrot Aug 17, 2016
0173952
Fix py3 xfail expression evaluation and parametrize strict
hackebrot Aug 17, 2016
dfc659f
Fix sys.version_info expression in xfail marker
hackebrot Aug 17, 2016
4ed412e
unittest's unexpectedSuccess should work as non-strict xpass
nicoddemus Aug 17, 2016
224ef67
Quick fix for tests in config depended on the current directory
nicoddemus Aug 17, 2016
0fb34cd
Update CHANGELOG entries
nicoddemus Aug 18, 2016
68ebf55
Merge remote-tracking branch 'upstream/master' into fix-report-outcom…
nicoddemus Aug 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Treat unittest.expectedFailure pass as a failure
  • Loading branch information
@hackebrot
hackebrot committed Aug 12, 2016
commit 296f42a2c9f0870c793444837ae58c2da816f9e7
11 changes: 7 additions & 4 deletions _pytest/skipping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,13 @@ def pytest_runtest_makereport(item, call):
evalskip = getattr(item, '_evalskip', None)
# unitttest special case, see setting of _unexpectedsuccess
if hasattr(item, '_unexpectedsuccess') and rep.when == "call":
# we need to translate into how pytest encodes xpass
rep.wasxfail = "reason: " + repr(item._unexpectedsuccess)
# TODO: Do we need to check for strict xfail here as well?
rep.outcome = "passed"
# unittest treats an 'unexpected successes' as a failure
# which means pytest needs to handle it like a 'xfail(strict=True)'
rep.outcome = "failed"
if item._unexpectedsuccess:
rep.longrepr = "Unexpected success: {0}".format(item._unexpectedsuccess)
else:
rep.longrepr = "Unexpected success"
elif item.config.option.runxfail:
pass # don't interefere
elif call.excinfo and call.excinfo.errisinstance(pytest.xfail.Exception):
Expand Down