diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2017-09-03 11:43:00 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-09-03 11:43:00 -0400 |
commit | cf5b062fe0978d7b68b57c12b4d7f4fae4469c1e (patch) | |
tree | ecec82c39fc707ba6372043eef50f78f1fd3155b | |
parent | d4c982faca64b5821542dd73a34b7037781c889a (diff) | |
download | pytest-runner-cf5b062fe0978d7b68b57c12b4d7f4fae4469c1e.tar.gz |
Correct logic in marker_passes. Ref #30.
-rw-r--r-- | ptr.py | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -110,8 +110,8 @@ class PyTest(orig.test): and matches this environment. """ return ( - marker - and not pkg_resources.invalid_marker(marker) + not marker + or not pkg_resources.invalid_marker(marker) and pkg_resources.evaluate_marker(marker) ) @@ -148,7 +148,7 @@ class PyTest(orig.test): # include unnamed extras or all if self.extras indicated if (not name or self.extras) # never include extras that fail to pass marker eval - and (not marker or self.marker_passes(marker)) + and self.marker_passes(marker) ) results = list(map(dist.fetch_build_eggs, matching_extras)) return _itertools.chain.from_iterable(results) |