Skip to content

Commit 6596183

Browse files
committed
Update tests to use new preferred API.
1 parent a49252b commit 6596183

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

tests/test_api.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,24 @@ def test_read_text(self):
6464
self.assertEqual(top_level.read_text(), 'mod\n')
6565

6666
def test_entry_points(self):
67-
entries = dict(entry_points()['entries'])
68-
ep = entries['main']
67+
ep = entry_points()['entries']['main']
6968
self.assertEqual(ep.value, 'mod:main')
7069
self.assertEqual(ep.extras, [])
7170

7271
def test_entry_points_distribution(self):
73-
entries = dict(entry_points()['entries'])
72+
entries = entry_points()['entries']
7473
for entry in ("main", "ns:sub"):
7574
ep = entries[entry]
7675
self.assertIn(ep.dist.name, ('distinfo-pkg', 'egginfo-pkg'))
7776
self.assertEqual(ep.dist.version, "1.0.0")
7877

78+
def test_entry_points_missing_name(self):
79+
with self.assertRaises(KeyError):
80+
entry_points()['entries']['missing']
81+
82+
def test_entry_points_missing_group(self):
83+
assert entry_points()['missing'] == ()
84+
7985
def test_metadata_for_this_package(self):
8086
md = metadata('egginfo-pkg')
8187
assert md['author'] == 'Steven Ma'

tests/test_main.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,11 @@ def test_import_nonexistent_module(self):
5757
importlib.import_module('does_not_exist')
5858

5959
def test_resolve(self):
60-
entries = dict(entry_points()['entries'])
61-
ep = entries['main']
60+
ep = entry_points()['entries']['main']
6261
self.assertEqual(ep.load().__name__, "main")
6362

6463
def test_entrypoint_with_colon_in_name(self):
65-
entries = dict(entry_points()['entries'])
66-
ep = entries['ns:sub']
64+
ep = entry_points()['entries']['ns:sub']
6765
self.assertEqual(ep.value, 'mod:main')
6866

6967
def test_resolve_without_attr(self):

tests/test_zip.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_zip_version_does_not_match(self):
4545
version('definitely-not-installed')
4646

4747
def test_zip_entry_points(self):
48-
scripts = dict(entry_points()['console_scripts'])
48+
scripts = entry_points()['console_scripts']
4949
entry_point = scripts['example']
5050
self.assertEqual(entry_point.value, 'example:main')
5151
entry_point = scripts['Example']

0 commit comments

Comments
 (0)