diff --git a/AUTHORS b/AUTHORS index 0492a1659b9..1a138091eff 100644 --- a/AUTHORS +++ b/AUTHORS @@ -78,6 +78,7 @@ Henk-Jaap Wagenaar Hugo van Kemenade Hui Wang (coldnight) Ian Bicking +Ian Lesperance Jaap Broekhuizen Jan Balster Janne Vanhala diff --git a/_pytest/skipping.py b/_pytest/skipping.py index a1e5b43800b..98fc51c7ff8 100644 --- a/_pytest/skipping.py +++ b/_pytest/skipping.py @@ -261,7 +261,7 @@ def pytest_runtest_makereport(item, call): else: rep.outcome = "passed" rep.wasxfail = explanation - elif item._skipped_by_mark and rep.skipped and type(rep.longrepr) is tuple: + elif getattr(item, '_skipped_by_mark', False) and rep.skipped and type(rep.longrepr) is tuple: # skipped by mark.skipif; change the location of the failure # to point to the item definition, otherwise it will display # the location of where the skip exception was raised within pytest diff --git a/changelog/3074.bugfix b/changelog/3074.bugfix new file mode 100644 index 00000000000..814f26ff10d --- /dev/null +++ b/changelog/3074.bugfix @@ -0,0 +1 @@ +Fix skipping plugin reporting hook when test aborted before plugin setup hook.