hoist config sections to constant, use in test

Author: bollwyvl

python_packages/jupyter_lsp/jupyter_lsp/constants.py

@@ -8,3 +8,6 @@
 EP_LISTENER_ALL_V1 = "jupyter_lsp_listener_all_v1"
 EP_LISTENER_CLIENT_V1 = "jupyter_lsp_listener_client_v1"
 EP_LISTENER_SERVER_V1 = "jupyter_lsp_listener_server_v1"
+
+# jupyter*config.d where language_servers can be defined
+APP_CONFIG_D_SECTIONS = ["_", "_notebook_", "_server_"]

python_packages/jupyter_lsp/jupyter_lsp/manager.py

@@ -15,6 +15,7 @@
 from traitlets import Unicode, default
 
 from .constants import (
+    APP_CONFIG_D_SECTIONS,
     EP_LISTENER_ALL_V1,
     EP_LISTENER_CLIENT_V1,
     EP_LISTENER_SERVER_V1,
@@ -85,7 +86,7 @@ def _default_conf_d_language_servers(self):
 
         manager = ConfigManager(read_config_path=jupyter_config_path())
 
-        for app in ["_", "_notebook_", "_server_"]:
+        for app in APP_CONFIG_D_SECTIONS:
             language_servers.update(
                 **manager.get(f"jupyter{app}config")
                 .get(self.__class__.__name__, {})

python_packages/jupyter_lsp/jupyter_lsp/tests/conftest.py

@@ -11,9 +11,10 @@
 
 # local imports
 from jupyter_lsp import LanguageServerManager
+from jupyter_lsp.constants import APP_CONFIG_D_SECTIONS
 from jupyter_lsp.handlers import LanguageServersHandler, LanguageServerWebSocketHandler
 
-# these should always be available in a test environment ()
+# these should always be available in a test environment
 KNOWN_SERVERS = [
     "bash-language-server",
     "dockerfile-language-server-nodejs",
@@ -46,6 +47,28 @@ def manager() -> LanguageServerManager:
     return LanguageServerManager()
 
 
+@fixture
+def echo_spec():
+    return {"argv": ["echo", "no server here"], "languages": ["klingon"], "version": 2}
+
+
+@fixture
+def echo_conf_json(echo_spec) -> str:
+    return json.dumps(
+        {"LanguageServerManager": {"language_servers": {"_echo_": echo_spec}}},
+        indent=2,
+        sort_keys=True,
+    )
+
+
+@fixture(params=sorted(APP_CONFIG_D_SECTIONS))
+def app_config_d(request, tmp_path, monkeypatch) -> pathlib.Path:
+    conf_d = tmp_path / f"jupyter{request.param}config.d"
+    conf_d.mkdir()
+    monkeypatch.setenv("JUPYTER_CONFIG_PATH", f"{tmp_path}")
+    return conf_d
+
+
 @fixture(params=sorted(KNOWN_SERVERS))
 def known_server(request):
     return request.param

python_packages/jupyter_lsp/jupyter_lsp/tests/test_conf_d.py

@@ -0,0 +1,6 @@
+def test_conf_d_language_servers(echo_conf_json, handlers, app_config_d):
+    (app_config_d / "echo.json").write_text(echo_conf_json)
+    handler, ws_handler = handlers
+    manager = handler.manager
+    manager.initialize()
+    assert "_echo_" in [*manager.language_servers]

scripts/utest.py

@@ -26,6 +26,7 @@ def run_tests():
         "jupyter_lsp",
         "--cov-report",
         "term-missing:skip-covered",
+        "--no-cov-on-fail",
         "-p",
         "no:warnings",
         "--flake8",