From 3d18c9c1c6e58e30da97e74fc79efb91f1aae24e Mon Sep 17 00:00:00 2001
From: Barney Gale <barney.gale@gmail.com>
Date: Sun, 18 Dec 2016 21:30:00 +0000
Subject: [PATCH 1/3] 'xfail' markers without a condition no longer rely on the
 underlying `Item` deriving from `PyobjMixin`

---
 _pytest/skipping.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_pytest/skipping.py b/_pytest/skipping.py
index a8eaea98a..cfaed2fa7 100644
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -119,7 +119,6 @@ class MarkEvaluator:
         if hasattr(self, 'result'):
             return self.result
         if self.holder:
-            d = self._getglobals()
             if self.holder.args or 'condition' in self.holder.kwargs:
                 self.result = False
                 # "holder" might be a MarkInfo or a MarkDecorator; only
@@ -135,6 +134,7 @@ class MarkEvaluator:
                     for expr in args:
                         self.expr = expr
                         if isinstance(expr, py.builtin._basestring):
+                            d = self._getglobals()
                             result = cached_eval(self.item.config, expr, d)
                         else:
                             if "reason" not in kwargs:

From 8db9915374f60d00780b758b98ada8d3f80af9bb Mon Sep 17 00:00:00 2001
From: Barney Gale <barney.gale@gmail.com>
Date: Sun, 18 Dec 2016 21:39:35 +0000
Subject: [PATCH 2/3] Update AUTHORS, CHANGELOG

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

diff --git a/AUTHORS b/AUTHORS
index 8c6fa1b5d..3999db9b3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,7 @@ Antony Lee
 Armin Rigo
 Aron Curzon
 Aviv Palivoda
+Barney Gale
 Ben Webb
 Benjamin Peterson
 Bernard Pratz
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7c3df0327..64453f259 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,7 +1,10 @@
 3.0.6.dev0 (unreleased)
 =======================
 
-*
+* Conditionless ``xfail`` markers no longer rely on the underlying test item
+  being an instance of ``PyobjMixin``, and can therefore apply to tests not
+  collected by the built-in python test collector. Thanks `@barneygale`_ for the
+  PR.
 
 * pytest no longer recognizes coroutine functions as yield tests (`#2129`_).
   Thanks to `@malinoff`_ for the PR.

From df409a0c0ee9948d3725ee79c4a0a91960466af7 Mon Sep 17 00:00:00 2001
From: Barney Gale <barney.gale@gmail.com>
Date: Mon, 2 Jan 2017 22:01:40 +0000
Subject: [PATCH 3/3] Fix CHANGELOG.rst

---
 CHANGELOG.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 64453f259..eca520bbc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -19,6 +19,7 @@
 
 *
 
+.. _@barneygale: https://github.com/barneygale
 .. _@lesteve: https://github.com/lesteve
 .. _@malinoff: https://github.com/malinoff
 .. _@pelme: https://github.com/pelme