Try fixing tests

Author: martinRenou

tests/server/cwd_subdir_test.py

@@ -9,8 +9,8 @@ def cwd_subdir_notebook_url(base_url):
 
 
 @pytest.fixture
-def voila_args(notebook_directory, voila_args_extra):
-    return ['--VoilaTest.root_dir=%r' % notebook_directory] + voila_args_extra
+def jupyter_server_args_extra(notebook_directory):
+    return ['--ServerApp.root_dir=%r' % notebook_directory]
 
 
 async def test_hello_world(http_server_client, cwd_subdir_notebook_url):

tests/server/execute_cpp_test.py

@@ -10,13 +10,8 @@ def cpp_file_url(base_url):
 
 
 @pytest.fixture
-def jupyter_server_args_extra():
-    return ['--VoilaConfiguration.extension_language_mapping={".xcpp": "C++11"}']
-
-
-@pytest.fixture
-def voila_args(notebook_directory, voila_args_extra):
-    return ['--VoilaTest.root_dir=%r' % notebook_directory] + voila_args_extra
+def jupyter_server_args_extra(notebook_directory):
+    return ['--ServerApp.root_dir=%r' % notebook_directory, '--VoilaConfiguration.extension_language_mapping={".xcpp": "C++11"}']
 
 
 @pytest.mark.skipif(not TEST_XEUS_CLING, reason='opt in to avoid having to install xeus-cling')

tests/server/tree_test.py

@@ -3,13 +3,8 @@
 
 
 @pytest.fixture
-def voila_args(notebook_directory, voila_args_extra):
-    return ['--VoilaTest.root_dir=%r' % notebook_directory] + voila_args_extra
-
-
-@pytest.fixture
-def jupyter_server_args_extra():
-    return ['--VoilaConfiguration.extension_language_mapping={".xcpp": "C++11"}']
+def jupyter_server_args_extra(notebook_directory):
+    return ['--ServerApp.root_dir=%r' % notebook_directory, '--VoilaConfiguration.extension_language_mapping={".xcpp": "C++11"}']
 
 
 async def test_tree(http_server_client, base_url):