aboutsummaryrefslogtreecommitdiffstats
path: root/pkg_resources/tests/test_resources.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-04-15 09:03:49 +0200
committerJason R. Coombs <jaraco@jaraco.com>2016-04-15 09:03:49 +0200
commitdd5caefb987dbd15495047fc653fa71d4667eb43 (patch)
treee79461dbd70903addafc07aafe84a44eb397ba82 /pkg_resources/tests/test_resources.py
parentbc35160987a7dda23de0c898a7e8ae4363504cde (diff)
downloadexternal_python_setuptools-dd5caefb987dbd15495047fc653fa71d4667eb43.tar.gz
external_python_setuptools-dd5caefb987dbd15495047fc653fa71d4667eb43.tar.bz2
external_python_setuptools-dd5caefb987dbd15495047fc653fa71d4667eb43.zip
Always inject extra into the environment when evaluating markers. Fixes #544.
Diffstat (limited to 'pkg_resources/tests/test_resources.py')
-rw-r--r--pkg_resources/tests/test_resources.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 0a72d941..31847dc8 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -189,7 +189,7 @@ class TestDistro:
def test_environment_marker_evaluation_called(self):
"""
If one package foo requires bar without any extras,
- markers should pass for bar.
+ markers should pass for bar without extras.
"""
parent_req, = parse_requirements("foo")
req, = parse_requirements("bar;python_version>='2'")
@@ -201,14 +201,6 @@ class TestDistro:
req_extras = pkg_resources._ReqExtras({req: parent_req.extras})
assert req_extras.markers_pass(req)
- # extra should not be present in the marker namespace if
- # no markers were supplied
- parent_req, = parse_requirements("foo")
- req, = parse_requirements("bar;extra==''")
- req_extras = pkg_resources._ReqExtras({req: parent_req.extras})
- with pytest.raises(packaging.markers.UndefinedEnvironmentName):
- req_extras.markers_pass(req)
-
def test_marker_evaluation_with_extras(self):
"""Extras are also evaluated as markers at resolution time."""
ad = pkg_resources.Environment([])