rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quteproc: Ignore failing messages on xfail

Browse Source 
When a test calls pytest.xfail it might stop early, so the message
doesn't get marked as ignored.
This commit is contained in:
Florian Bruhin 2016-08-18 22:23:29 +02:00
parent d5131aa0a4
commit 1c581cf1cf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/end2end/fixtures/quteprocess.py
View File

@ -620,7 +620,9 @@ def quteproc(quteproc_process, httpbin, request):
request.node._quteproc_log = quteproc_process.captured_log
quteproc_process.before_test()
yield quteproc_process
quteproc_process.after_test(did_fail=request.node.rep_call.failed)
call = request.node.rep_call
did_fail = call.failed or hasattr(call, 'wasxfail')
quteproc_process.after_test(did_fail=did_fail)
@pytest.yield_fixture
@ -634,5 +636,6 @@ def quteproc_new(qapp, httpbin, request):
request.node._quteproc_log = proc.captured_log
# Not calling before_test here as that would start the process
yield proc
proc.after_test(did_fail=request.node.rep_call.failed)
did_fail = call.failed or hasattr(call, 'wasxfail')
proc.after_test(did_fail=did_fail)
proc.terminate()