summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-02-08 16:59:00 -0500
committerJason R. Coombs <jaraco@jaraco.com>2017-02-08 16:59:33 -0500
commit228cbcb5672579f21601707ba0b23169fb4f423f (patch)
treef9513c0fb96cd006980322e7c76d508ee6142c3b
parent998992b2a58634527509e4659a210f412582b265 (diff)
parentbb6b39bea530bdff158330665e93a9ee13f8c771 (diff)
downloadpytest-runner-228cbcb5672579f21601707ba0b23169fb4f423f.tar.gz
Merge commit 'bb6b39b'. Ref #28.2.11.1
-rw-r--r--CHANGES.rst5
-rw-r--r--ptr.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index c640d37..7e56ea9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+2.11.1
+~~~~~~
+
+* #28: Fix logic in marker evaluation.
+
2.11
~~~~
diff --git a/ptr.py b/ptr.py
index 52fb7b4..8a2da90 100644
--- a/ptr.py
+++ b/ptr.py
@@ -105,7 +105,7 @@ class PyTest(orig.test):
reqs
for (name, sep, marker), reqs in spec_extras
# never include extras that fail to pass marker eval
- if marker and not self.marker_passes(marker)
+ if self.marker_passes(marker)
# include unnamed extras or all if self.extras indicated
and (not name or self.extras)
)