diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-04-07 22:22:58 +0100 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-04-07 22:22:58 +0100 |
| commit | f664385be2051cd135ad52e1563993945e0abe10 (patch) | |
| tree | 6df0452289f22685455a0e4d20ab582f86c770bb /pkg_resources/tests | |
| parent | be663b8596fc3e3d02cb5716db1d638788a0230e (diff) | |
| download | python-setuptools-git-f664385be2051cd135ad52e1563993945e0abe10.tar.gz | |
Adjust expectation that 'extra' is not in the marker evaluation if no extras demanded the requirement.
Diffstat (limited to 'pkg_resources/tests')
| -rw-r--r-- | pkg_resources/tests/test_resources.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py index acc8dc1e..bd074f22 100644 --- a/pkg_resources/tests/test_resources.py +++ b/pkg_resources/tests/test_resources.py @@ -201,11 +201,13 @@ class TestDistro: req_extras = pkg_resources._ReqExtras({req: parent_req.extras}) assert req_extras.markers_pass(req) - # this is a little awkward; I would want this to fail + # extra should not be present in the marker namespace if + # no markers were supplied parent_req, = parse_requirements("foo") - req, = parse_requirements("bar;python_version>='2' and extra==''") + req, = parse_requirements("bar;extra==''") req_extras = pkg_resources._ReqExtras({req: parent_req.extras}) - assert req_extras.markers_pass(req) + 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.""" |
