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

Improve warning handling #1386

Merged
merged 1 commit into from
Jan 16, 2024
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
4 changes: 2 additions & 2 deletions jupyter_server/services/contents/largefilemanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def save(self, model, path=""):
path = path.strip("/")

if chunk == 1:
self.run_pre_save_hook(model=model, path=path)
self.run_pre_save_hooks(model=model, path=path)

if "type" not in model:
raise web.HTTPError(400, "No file type provided")
Expand Down Expand Up @@ -92,7 +92,7 @@ async def save(self, model, path=""):
path = path.strip("/")

if chunk == 1:
self.run_pre_save_hook(model=model, path=path)
self.run_pre_save_hooks(model=model, path=path)

if "type" not in model:
raise web.HTTPError(400, "No file type provided")
Expand Down
8 changes: 1 addition & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -239,13 +239,7 @@ timeout = 100
timeout_method = "thread"
filterwarnings = [
"error",
"ignore:Passing a schema to Validator.iter_errors:DeprecationWarning",
"ignore:run_pre_save_hook is deprecated:DeprecationWarning",
"always:unclosed <socket.socket:ResourceWarning",
"module:Jupyter is migrating its paths to use standard platformdirs:DeprecationWarning",
"ignore:jupyter_server.base.zmqhandlers module is deprecated in Jupyter Server 2.0:DeprecationWarning",
"ignore:datetime.datetime.utc:DeprecationWarning:dateutil",
"ignore:datetime.datetime.utc:DeprecationWarning:tornado",
"ignore:datetime.datetime.utc:DeprecationWarning",
"module:add_callback_from_signal is deprecated:DeprecationWarning",
]

Expand Down
5 changes: 5 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import os

# isort: off
# This must come before any Jupyter imports.
os.environ["JUPYTER_PLATFORM_DIRS"] = "1"
# isort: on

import pytest
from nbformat import writes
from nbformat.v4 import new_notebook
Expand Down
8 changes: 6 additions & 2 deletions tests/extension/test_app.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import asyncio
import json
from io import StringIO
from logging import StreamHandler
from typing import Any
from unittest import mock

import pytest
from traitlets.config import Config
Expand Down Expand Up @@ -121,12 +123,14 @@ def test_extensionapp_no_parent():

@pytest.mark.parametrize("expected_value, config", OPEN_BROWSER_COMBINATIONS)
async def test_browser_open(monkeypatch, jp_environ, config, expected_value):
serverapp = MockExtensionApp.initialize_server(config=Config(config))
with mock.patch("jupyter_server.serverapp.ServerApp.init_httpserver"):
serverapp = MockExtensionApp.initialize_server(config=Config(config))
assert serverapp.open_browser == expected_value


async def test_load_parallel_extensions(monkeypatch, jp_environ):
serverapp = MockExtensionApp.initialize_server()
with mock.patch("jupyter_server.serverapp.ServerApp.init_httpserver"):
serverapp = MockExtensionApp.initialize_server()
exts = serverapp.extension_manager.extensions
assert "tests.extension.mockextensions.mock1" in exts
assert "tests.extension.mockextensions" in exts
Expand Down
29 changes: 15 additions & 14 deletions tests/test_gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -715,20 +715,21 @@ async def test_websocket_connection_closed(init_gateway, jp_serverapp, jp_fetch,
handler.ws_connection.is_closing = lambda: True

# Create the GatewayWebSocketConnection and attach it to the handler...
conn = GatewayWebSocketConnection(parent=km, websocket_handler=handler)
handler.connection = conn
await conn.connect()

# Processing websocket messages happens in separate coroutines and any
# errors in that process will show up in logs, but not bubble up to the
# caller.
#
# To check for these, we wait for the server to stop and then check the
# logs for errors.
await jp_serverapp._cleanup()
for _, level, message in caplog.record_tuples:
if level >= logging.ERROR:
pytest.fail(f"Logs contain an error: {message}")
with mocked_gateway:
conn = GatewayWebSocketConnection(parent=km, websocket_handler=handler)
handler.connection = conn
await conn.connect()

# Processing websocket messages happens in separate coroutines and any
# errors in that process will show up in logs, but not bubble up to the
# caller.
#
# To check for these, we wait for the server to stop and then check the
# logs for errors.
await jp_serverapp._cleanup()
for _, level, message in caplog.record_tuples:
if level >= logging.ERROR:
pytest.fail(f"Logs contain an error: {message}")


#
Expand Down
Loading