Merge pull request #3075 from elliterate/bugs/fix-skipping-plugin-rep…

…orting Assume not skipped by mark if attribute missing
pytest-dev · Jan 6, 2018 · bc66f7e · bc66f7e
2 parents 06a1823 + 25b504b
commit bc66f7e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -0,0 +1 @@
+Fix skipping plugin reporting hook when test aborted before plugin setup hook.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix skipping plugin reporting hook when test aborted before plugin setup hook.