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.

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

Enable Server Tests on Windows #519

Merged
merged 1 commit into from
May 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion jupyter_server/tests/extension/test_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ def test_extension_manager_api():
}
manager = ExtensionManager()
assert manager.config_manager
assert _normalize_path(manager.config_manager.read_config_path) == _normalize_path(jupyter_config_path())
expected = _normalize_path(os.path.join(jupyter_config_path()[0], 'serverconfig'))
assert _normalize_path(manager.config_manager.read_config_path[0]) == expected
manager.from_jpserver_extensions(jpserver_extensions)
assert len(manager.extensions) == 1
assert "jupyter_server.tests.extension.mockextensions" in manager.extensions
Expand Down
9 changes: 2 additions & 7 deletions jupyter_server/tests/test_terminal.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Only Run tests on MacOS and Linux
import os
import shutil
import pytest
import json
Expand All @@ -8,11 +8,6 @@
from tornado.httpclient import HTTPClientError
from traitlets.config import Config

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


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

ws.close()

assert str(terminal_path) in message_stdout
assert os.path.basename(terminal_path) in message_stdout


async def test_culling_config(jp_server_config, jp_configurable_serverapp):
Expand Down