From bad261279c5af15e2126023a03f08389c189b2d5 Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Fri, 3 Feb 2017 16:04:34 +0100
Subject: [PATCH 1/3] Do not asssume `Item.obj` in 'skipping' plugin

See #2231 for discussion.
---
 _pytest/skipping.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/_pytest/skipping.py b/_pytest/skipping.py
index 91a34169f..591977efd 100644
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -112,7 +112,8 @@ class MarkEvaluator:
 
     def _getglobals(self):
         d = {'os': os, 'sys': sys, 'config': self.item.config}
-        d.update(self.item.obj.__globals__)
+        if hasattr(self.item, 'obj'):
+            d.update(self.item.obj.__globals__)
         return d
 
     def _istrue(self):

From 1a88a91c7a04ed996bee3c8957e07d9a0c735de1 Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Fri, 3 Feb 2017 16:29:43 +0100
Subject: [PATCH 2/3] Update authors/history

---
 AUTHORS       | 1 +
 CHANGELOG.rst | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index c2400f508..d1a4aa675 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -141,5 +141,6 @@ Trevor Bekolay
 Tyler Goodlet
 Vasily Kuznetsov
 Victor Uriarte
+Vidar T. Fauske
 Wouter van Ackooy
 Xuecong Liao
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 612ee0f3b..b81803324 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,7 +6,8 @@
 * Replace ``raise StopIteration`` usages in the code by simple ``returns`` to finish generators, in accordance to `PEP-479`_ (`#2160`_).
   Thanks `@tgoodlet`_ for the report and `@nicoddemus`_ for the PR.
 
-*
+* Skipping plugin now also works with test items generated by custom collectors (`#2231`_).
+  Thanks to `@vidartf`_.
 
 *
 
@@ -16,6 +17,10 @@
 
 .. _PEP-479: https://www.python.org/dev/peps/pep-0479/
 
+.. _#2231: https://github.com/pytest-dev/pytest/issues/2231
+
+.. _@vidartf: https://github.com/vidartf
+
 
 3.0.6 (2017-01-22)
 ==================

From 832c89dd5fa7c310ae05ddcffc81025bed7a3c14 Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Fri, 3 Feb 2017 16:59:30 +0100
Subject: [PATCH 3/3] Test for `pytest.mark.xfail` with non-Python Item

---
 testing/test_skipping.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/testing/test_skipping.py b/testing/test_skipping.py
index 2e7868d3a..ac4412fcb 100644
--- a/testing/test_skipping.py
+++ b/testing/test_skipping.py
@@ -969,3 +969,26 @@ def test_module_level_skip_error(testdir):
     result.stdout.fnmatch_lines(
         "*Using pytest.skip outside of a test is not allowed*"
     )
+
+
+def test_mark_xfail_item(testdir):
+    # Ensure pytest.mark.xfail works with non-Python Item
+    testdir.makeconftest("""
+        import pytest
+
+        class MyItem(pytest.Item):
+            nodeid = 'foo'
+            def setup(self):
+                marker = pytest.mark.xfail(True, reason="Expected failure")
+                self.add_marker(marker)
+            def runtest(self):
+                assert False
+
+        def pytest_collect_file(path, parent):
+            return MyItem("foo", parent)
+    """)
+    result = testdir.inline_run()
+    passed, skipped, failed = result.listoutcomes()
+    assert not failed
+    xfailed = [r for r in skipped if hasattr(r, 'wasxfail')]
+    assert xfailed