Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make tests less sensitive to default kernel name #1118

Merged
merged 2 commits into from
Dec 6, 2022
Merged

Make tests less sensitive to default kernel name #1118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adea357
make tests less sensitive to default kernel name
blink1073 Dec 6, 2022
a85405a
Merge branch 'main' into use-python-by-default-in-tests
blink1073 Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions tests/services/kernelspecs/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
import pytest
from tornado.httpclient import HTTPClientError

from jupyter_server.serverapp import ServerApp

from ...utils import expected_http_error, some_resource


async def test_list_kernelspecs_bad(jp_fetch, jp_kernelspecs, jp_data_dir):
async def test_list_kernelspecs_bad(jp_fetch, jp_kernelspecs, jp_data_dir, jp_serverapp):
app: ServerApp = jp_serverapp
default = app.kernel_manager.default_kernel_name
bad_kernel_dir = jp_data_dir.joinpath(jp_data_dir, "kernels", "bad2")
bad_kernel_dir.mkdir(parents=True)
bad_kernel_json = bad_kernel_dir.joinpath("kernel.json")
Expand All @@ -15,17 +19,19 @@ async def test_list_kernelspecs_bad(jp_fetch, jp_kernelspecs, jp_data_dir):
r = await jp_fetch("api", "kernelspecs", method="GET")
model = json.loads(r.body.decode())
assert isinstance(model, dict)
assert model["default"] == "echo"
assert model["default"] == default
specs = model["kernelspecs"]
assert isinstance(specs, dict)
assert len(specs) > 2


async def test_list_kernelspecs(jp_fetch, jp_kernelspecs):
async def test_list_kernelspecs(jp_fetch, jp_kernelspecs, jp_serverapp):
app: ServerApp = jp_serverapp
default = app.kernel_manager.default_kernel_name
r = await jp_fetch("api", "kernelspecs", method="GET")
model = json.loads(r.body.decode())
assert isinstance(model, dict)
assert model["default"] == "echo"
assert model["default"] == default
specs = model["kernelspecs"]
assert isinstance(specs, dict)
assert len(specs) > 2
Expand All @@ -34,7 +40,7 @@ def is_sample_kernelspec(s):
return s["name"] == "sample" and s["spec"]["display_name"] == "Test kernel"

def is_default_kernelspec(s):
return s["name"] == "echo" and s["spec"]["display_name"].startswith("echo")
return s["name"] == default

assert any(is_sample_kernelspec(s) for s in specs.values()), specs
assert any(is_default_kernelspec(s) for s in specs.values()), specs
Expand Down