From ef428d7278002b558541300fb7b7a96c8dbac830 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 16:45:16 -0500 Subject: Move tests to be adjacent with other parsing tests. --- setuptools/tests/test_resources.py | 5 +++++ tests/test_pkg_resources.py | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index ecd45bca..94370ff1 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -250,6 +250,11 @@ class TestEntryPoints: assert ep.attrs == ("foo",) assert ep.extras == () + # plus in the name + spec = "html+mako = mako.ext.pygmentplugin:MakoHtmlLexer" + ep = EntryPoint.parse(spec) + assert ep.name == 'html+mako' + def testRejects(self): for ep in [ "foo", "x=1=2", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2", diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py index 4dfd14b3..564d7cec 100644 --- a/tests/test_pkg_resources.py +++ b/tests/test_pkg_resources.py @@ -109,11 +109,3 @@ class TestIndependence: ) cmd = [sys.executable, '-c', '; '.join(lines)] subprocess.check_call(cmd) - - -class TestEntryPoint: - """Tests that ensure EntryPoint behaviour doesn't regress.""" - def test_accepts_old_entry_points(self): - """https://bitbucket.org/pypa/setuptools/issue/323/install-issues-with-102""" - entry_point_string = 'html+mako = mako.ext.pygmentplugin:MakoHtmlLexer' - pkg_resources.EntryPoint.parse(entry_point_string) -- cgit v1.2.3