Skip to content

Commit 83a49c8

Browse files
authored
Enable Server Tests on Windows (#519)
1 parent 284c938 commit 83a49c8

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

jupyter_server/tests/extension/test_manager.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ def test_extension_manager_api():
8383
}
8484
manager = ExtensionManager()
8585
assert manager.config_manager
86-
assert _normalize_path(manager.config_manager.read_config_path) == _normalize_path(jupyter_config_path())
86+
expected = _normalize_path(os.path.join(jupyter_config_path()[0], 'serverconfig'))
87+
assert _normalize_path(manager.config_manager.read_config_path[0]) == expected
8788
manager.from_jpserver_extensions(jpserver_extensions)
8889
assert len(manager.extensions) == 1
8990
assert "jupyter_server.tests.extension.mockextensions" in manager.extensions

jupyter_server/tests/test_terminal.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Only Run tests on MacOS and Linux
1+
import os
22
import shutil
33
import pytest
44
import json
@@ -8,11 +8,6 @@
88
from tornado.httpclient import HTTPClientError
99
from traitlets.config import Config
1010

11-
# Skip this whole module on Windows. The terminal API leads
12-
# to timeouts on Windows CI.
13-
if sys.platform.startswith('win'):
14-
pytest.skip("Terminal API tests time out on Windows.", allow_module_level=True)
15-
1611

1712
# Kill all running terminals after each test to avoid cross-test issues
1813
# with still running terminals.
@@ -137,7 +132,7 @@ async def test_terminal_create_with_cwd(jp_fetch, jp_ws_fetch, terminal_path):
137132

138133
ws.close()
139134

140-
assert str(terminal_path) in message_stdout
135+
assert os.path.basename(terminal_path) in message_stdout
141136

142137

143138
async def test_culling_config(jp_server_config, jp_configurable_serverapp):

0 commit comments

Comments
 (0)