Skip to content

Commit

Permalink
Remove use of pytest-asyncio
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbrochart committed Dec 12, 2023
1 parent 5e5749f commit 797d843
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 32 deletions.
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ test = [
"jupyter_server_fileid[test]",
"pytest>=7.0",
"pytest-cov",
"pytest-asyncio",
"websockets"
]
docs = [
Expand Down
18 changes: 0 additions & 18 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,12 @@
from jupyter_collaboration.loaders import FileLoader
from jupyter_collaboration.rooms import DocumentRoom
from jupyter_collaboration.stores import SQLiteYStore
from jupyter_server.serverapp import ServerApp

from .utils import FakeContentsManager, FakeEventLogger, FakeFileIDManager

pytest_plugins = ["jupyter_server.pytest_plugin", "jupyter_server_fileid.pytest_plugin"]


@pytest.fixture(autouse=True)
def jp_server_cleanup(jp_asyncio_loop): # noqa: PT004
"""Automatically cleans up server resources."""
yield
if jp_asyncio_loop.is_closed():
return

app: ServerApp = ServerApp.instance()
try:
jp_asyncio_loop.run_until_complete(app._cleanup())
except (RuntimeError, SystemExit) as e:
print("ignoring cleanup error", e) # noqa: T201
if hasattr(app, "kernel_manager"):
app.kernel_manager.context.destroy()
ServerApp.clear_instance()


@pytest.fixture
def jp_server_config(jp_root_dir, jp_server_config):
return {
Expand Down
5 changes: 0 additions & 5 deletions tests/test_loaders.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@
import asyncio
from datetime import datetime

import pytest

from jupyter_collaboration.loaders import FileLoader, FileLoaderMapping

from .utils import FakeContentsManager, FakeFileIDManager


@pytest.mark.asyncio
async def test_FileLoader_with_watcher():
id = "file-4567"
path = "myfile.txt"
Expand Down Expand Up @@ -46,7 +43,6 @@ async def trigger(*args):
await loader.clean()


@pytest.mark.asyncio
async def test_FileLoader_without_watcher():
id = "file-4567"
path = "myfile.txt"
Expand Down Expand Up @@ -78,7 +74,6 @@ async def trigger(*args):
await loader.clean()


@pytest.mark.asyncio
async def test_FileLoaderMapping_with_watcher():
id = "file-4567"
path = "myfile.txt"
Expand Down
8 changes: 0 additions & 8 deletions tests/test_rooms.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
import asyncio
from datetime import datetime

import pytest
from jupyter_ydoc import YUnicode

from .utils import overite_msg, reload_msg


@pytest.mark.asyncio
async def test_should_initialize_document_room_without_store(rtc_create_mock_document_room):
content = "test"
_, _, room = rtc_create_mock_document_room("test-id", "test.txt", content)
Expand All @@ -21,7 +19,6 @@ async def test_should_initialize_document_room_without_store(rtc_create_mock_doc
assert room._document.source == content


@pytest.mark.asyncio
async def test_should_initialize_document_room_from_store(
rtc_create_SQLite_store, rtc_create_mock_document_room
):
Expand All @@ -38,7 +35,6 @@ async def test_should_initialize_document_room_from_store(
assert room._document.source == content


@pytest.mark.asyncio
async def test_should_overwrite_the_store(rtc_create_SQLite_store, rtc_create_mock_document_room):
id = "test-id"
content = "test"
Expand All @@ -54,7 +50,6 @@ async def test_should_overwrite_the_store(rtc_create_SQLite_store, rtc_create_mo
assert doc.source == content


@pytest.mark.asyncio
async def test_defined_save_delay_should_save_content_after_document_change(
rtc_create_mock_document_room,
):
Expand All @@ -70,7 +65,6 @@ async def test_defined_save_delay_should_save_content_after_document_change(
assert "save" in cm.actions


@pytest.mark.asyncio
async def test_undefined_save_delay_should_not_save_content_after_document_change(
rtc_create_mock_document_room,
):
Expand All @@ -86,7 +80,6 @@ async def test_undefined_save_delay_should_not_save_content_after_document_chang
assert "save" not in cm.actions


@pytest.mark.asyncio
async def test_should_reload_content_from_disk(rtc_create_mock_document_room):
content = "test"
last_modified = datetime.now()
Expand All @@ -109,7 +102,6 @@ async def test_should_reload_content_from_disk(rtc_create_mock_document_room):
assert room._document.source == content


@pytest.mark.asyncio
async def test_should_not_reload_content_from_disk(rtc_create_mock_document_room):
content = "test"
last_modified = datetime.now()
Expand Down

0 comments on commit 797d843

Please sign in to comment.