File tree Expand file tree Collapse file tree 2 files changed +17
-0
lines changed Expand file tree Collapse file tree 2 files changed +17
-0
lines changed Original file line number Diff line number Diff line change 19
19
from jupyter_server .extension import serverextension
20
20
from jupyter_server .serverapp import ServerApp
21
21
from jupyter_server .utils import url_path_join
22
+ < << << << HEAD
22
23
from jupyter_server .services .contents .filemanager import FileContentsManager
23
24
from jupyter_server .services .contents .largefilemanager import LargeFileManager
24
25
@@ -44,6 +45,8 @@ def mkdir(tmp_path, *parts):
44
45
def jp_home_dir (tmp_path ):
45
46
"""Provides a temporary HOME directory value."""
46
47
return mkdir (tmp_path , "home" )
48
+ == == == =
49
+ >> >> >> > Use jp prefix for fixtures
47
50
48
51
49
52
@pytest .fixture
Original file line number Diff line number Diff line change 11
11
from nbformat import v4 as nbformat
12
12
13
13
from jupyter_server .services .contents .filecheckpoints import AsyncFileCheckpoints , FileCheckpoints
14
+ from jupyter_server .services .contents .filemanager import AsyncFileContentsManager , FileContentsManager
14
15
from jupyter_server .utils import ensure_async
15
16
from ...utils import expected_http_error
16
17
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
+
17
31
# -------------- Functions ----------------------------
18
32
19
33
def _make_dir (jp_contents_manager , api_path ):
You can’t perform that action at this time.
0 commit comments