Skip to content

Commit 24dd618

Browse files
Mariko WakabayashiZsailer
authored andcommitted
Use jp prefix for fixtures
1 parent 3a97a6a commit 24dd618

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

jupyter_server/pytest_plugin.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from jupyter_server.extension import serverextension
2020
from jupyter_server.serverapp import ServerApp
2121
from jupyter_server.utils import url_path_join
22+
<<<<<<< HEAD
2223
from jupyter_server.services.contents.filemanager import FileContentsManager
2324
from jupyter_server.services.contents.largefilemanager import LargeFileManager
2425

@@ -44,6 +45,8 @@ def mkdir(tmp_path, *parts):
4445
def jp_home_dir(tmp_path):
4546
"""Provides a temporary HOME directory value."""
4647
return mkdir(tmp_path, "home")
48+
=======
49+
>>>>>>> Use jp prefix for fixtures
4750

4851

4952
@pytest.fixture

tests/services/contents/test_manager.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,23 @@
1111
from nbformat import v4 as nbformat
1212

1313
from jupyter_server.services.contents.filecheckpoints import AsyncFileCheckpoints, FileCheckpoints
14+
from jupyter_server.services.contents.filemanager import AsyncFileContentsManager, FileContentsManager
1415
from jupyter_server.utils import ensure_async
1516
from ...utils import expected_http_error
1617

18+
@pytest.fixture(params=[(FileContentsManager, True),
19+
(FileContentsManager, False),
20+
(AsyncFileContentsManager, True),
21+
(AsyncFileContentsManager, False)])
22+
def jp_contents_manager(request, tmp_path):
23+
contents_manager, use_atomic_writing = request.param
24+
return contents_manager(root_dir=str(tmp_path), use_atomic_writing=use_atomic_writing)
25+
26+
27+
@pytest.fixture(params=[FileContentsManager, AsyncFileContentsManager])
28+
def file_contents_manager_class(request, tmp_path):
29+
return request.param
30+
1731
# -------------- Functions ----------------------------
1832

1933
def _make_dir(jp_contents_manager, api_path):

0 commit comments

Comments
 (0)