skipping: simplify xfail handling during call phase

There is no need to do the XPASS check here, pytest_runtest_makereport
already handled that (the current handling there is dead code).

All the hook needs to do is refresh the xfail evaluation if needed, and
check the NOTRUN condition again.
This commit is contained in:
Ran Benita 2020-06-20 15:59:29 +03:00
parent 3e6fe92b7e
commit c9737ae914
1 changed files with 7 additions and 14 deletions

View File

@ -3,6 +3,7 @@ import os
import platform
import sys
import traceback
from typing import Generator
from typing import Optional
from typing import Tuple
@ -244,24 +245,16 @@ def pytest_runtest_setup(item: Item) -> None:
@hookimpl(hookwrapper=True)
def pytest_runtest_call(item: Item):
if not item.config.option.runxfail:
def pytest_runtest_call(item: Item) -> Generator[None, None, None]:
xfailed = item._store.get(xfailed_key, None)
if xfailed is None:
item._store[xfailed_key] = xfailed = evaluate_xfail_marks(item)
if not item.config.option.runxfail:
if xfailed and not xfailed.run:
xfail("[NOTRUN] " + xfailed.reason)
outcome = yield
passed = outcome.excinfo is None
if passed:
xfailed = item._store.get(xfailed_key, None)
if xfailed is None:
item._store[xfailed_key] = xfailed = evaluate_xfail_marks(item)
if xfailed and xfailed.strict:
del item._store[xfailed_key]
fail("[XPASS(strict)] " + xfailed.reason, pytrace=False)
yield
@hookimpl(hookwrapper=True)