Skip to content

Commit ccb4e2d

Browse files
authored
Merge pull request #503 from minrk/validate-return
ExtensionPoint: return True on successful validate()
2 parents 678878f + 0a86f7c commit ccb4e2d

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

jupyter_server/extension/manager.py

+2
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ def validate(self):
129129
self._get_loader()
130130
except Exception:
131131
return False
132+
else:
133+
return True
132134

133135
def link(self, serverapp):
134136
"""Link the extension to a Jupyter ServerApp object.

jupyter_server/extension/serverextension.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@ def list_server_extensions(self):
306306
GREEN_ENABLED if enabled else RED_DISABLED))
307307
try:
308308
self.log.info(" - Validating {}...".format(name))
309-
extension.validate()
309+
if not extension.validate():
310+
raise ValueError("validation failed")
310311
version = extension.version
311312
self.log.info(
312313
" {} {} {}".format(name, version, GREEN_OK)

jupyter_server/tests/extension/test_manager.py

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ def test_extension_point_api():
3030
assert app is not None
3131
assert callable(e.load)
3232
assert callable(e.link)
33+
assert e.validate()
3334

3435

3536
def test_extension_point_metadata_error():
@@ -59,6 +60,7 @@ def test_extension_package_api():
5960
assert hasattr(e, "extension_points")
6061
assert len(e.extension_points) == len(metadata_list)
6162
assert app.name in e.extension_points
63+
assert e.validate()
6264

6365

6466
def test_extension_package_notfound_error():

0 commit comments

Comments
 (0)