Simplify tests for preheat kernel mode

tests/app/cgi-test.py

@@ -1,22 +1,14 @@
 import pytest
-import os
 NOTEBOOK_PATH = 'cgi.ipynb'
 
 
 @pytest.fixture
-def notebook_cgi_path(base_url, preheat_mode):
-    if preheat_mode:
-        return base_url
+def notebook_cgi_path(base_url):
     return base_url + f'voila/render/{NOTEBOOK_PATH}'
 
 
 @pytest.fixture
-def voila_args(notebook_directory, voila_args_extra, preheat_mode):
-    if preheat_mode:
-        return [
-            os.path.join(notebook_directory, NOTEBOOK_PATH),
-            '--VoilaTest.log_level=DEBUG'
-        ] + voila_args_extra
+def voila_args(notebook_directory, voila_args_extra):
 
     return [
         '--VoilaTest.root_dir=%r' % notebook_directory,
@@ -25,8 +17,7 @@ def voila_args(notebook_directory, voila_args_extra, preheat_mode):
 
 
 async def test_cgi_using_query_parameters(http_server_client,
-                                          notebook_cgi_path, wait_for_kernel):
-    await wait_for_kernel()
+                                          notebook_cgi_path):
     response = await http_server_client.fetch(notebook_cgi_path +
                                               '?username=VOILA')
     assert response.code == 200

tests/app/config_paths_test.py

@@ -26,8 +26,8 @@ def test_config_contents_manager(voila_app):
     assert voila_app.contents_manager.use_atomic_writing is False
 
 
-async def test_template(http_server_client, base_url, wait_for_kernel):
-    await wait_for_kernel()
+async def test_template(http_server_client, base_url):
+
     response = await http_server_client.fetch(base_url)
     assert response.code == 200
     assert 'test_template.css' in response.body.decode('utf-8')

tests/app/conftest.py

@@ -1,7 +1,7 @@
 import os
 import pytest
 import voila.app
-import asyncio
+
 
 BASE_DIR = os.path.dirname(__file__)
 
@@ -33,13 +33,13 @@ def voila_args(voila_notebook, voila_args_extra, voila_config_file_paths_arg):
     return [voila_notebook, voila_config_file_paths_arg] + voila_args_extra + debug_args
 
 
-@pytest.fixture(params=[False, True])
-def preheat_mode(request):
+@pytest.fixture
+def preheat_mode():
     """Fixture used to activate/deactivate pre-heat kernel mode.
-    All tests will be executed in two modes automatically, override
-    this fixture in test file if you want to run only one mode.
+    Override this fixture in test file if you want to activate
+    preheat mode.
     """
-    return request.param
+    return False
 
 
 @pytest.fixture
@@ -61,12 +61,3 @@ def voila_app(voila_args, voila_config, preheat_config):
 @pytest.fixture
 def app(voila_app):
     return voila_app.app
-
-
-@pytest.fixture
-def wait_for_kernel(preheat_mode):
-    """Wait for kernel be heated in case of `preheat_mode = True`"""
-    async def inner(time=1):
-        if preheat_mode:
-            await asyncio.sleep(time)
-    return inner

tests/app/cwd_subdir_test.py

@@ -1,35 +1,26 @@
 # test serving a notebook
 import pytest
-import os
 
 NOTEBOOK_PATH = 'subdir/cwd_subdir.ipynb'
 
 
 @pytest.fixture
-def cwd_subdir_notebook_url(base_url, preheat_mode):
-    if preheat_mode:
-        return base_url
+def cwd_subdir_notebook_url(base_url):
     return base_url + f'voila/render/{NOTEBOOK_PATH}'
 
 
 @pytest.fixture
-def voila_args(notebook_directory, voila_args_extra, preheat_mode):
-    if preheat_mode:
-        return [
-            os.path.join(notebook_directory, NOTEBOOK_PATH),
-            '--VoilaTest.log_level=DEBUG',
-        ] + voila_args_extra
-    else:
-        return [
-            '--VoilaTest.root_dir=%r' % notebook_directory,
-            '--VoilaTest.log_level=DEBUG',
-        ] + voila_args_extra
+def voila_args(notebook_directory, voila_args_extra):
+    return [
+        '--VoilaTest.root_dir=%r' % notebook_directory,
+        '--VoilaTest.log_level=DEBUG',
+    ] + voila_args_extra
 
 
 async def test_hello_world(
-    http_server_client, cwd_subdir_notebook_url, wait_for_kernel
+    http_server_client, cwd_subdir_notebook_url
 ):
-    await wait_for_kernel()
+
     response = await http_server_client.fetch(cwd_subdir_notebook_url)
     html_text = response.body.decode('utf-8')
     assert 'check for the cwd' in html_text

tests/app/cwd_test.py

@@ -9,8 +9,8 @@ def voila_notebook(notebook_directory):
     return os.path.join(notebook_directory, 'cwd.ipynb')
 
 
-async def test_template_cwd(http_server_client, base_url, wait_for_kernel):
-    await wait_for_kernel()
+async def test_template_cwd(http_server_client, base_url):
+
     response = await http_server_client.fetch(base_url)
     html_text = response.body.decode('utf-8')
     assert 'check for the cwd' in html_text

tests/app/execute_cpp_test.py

@@ -7,8 +7,6 @@
 
 @pytest.fixture
 def cpp_file_url(base_url, preheat_mode):
-    if preheat_mode:
-        return base_url
     return base_url + f'voila/render/{NOTEBOOK_PATH}'
 
 
@@ -19,14 +17,12 @@ def voila_args_extra():
 
 @pytest.fixture
 def voila_args(notebook_directory, voila_args_extra, preheat_mode):
-    if preheat_mode:
-        return [os.path.join(notebook_directory, NOTEBOOK_PATH)] + voila_args_extra
     return ['--VoilaTest.root_dir=%r' % notebook_directory] + voila_args_extra
 
 
 @pytest.mark.skipif(not TEST_XEUS_CLING, reason='opt in to avoid having to install xeus-cling')
-async def test_non_existing_kernel(http_server_client, cpp_file_url, wait_for_kernel):
-    await wait_for_kernel()
+async def test_non_existing_kernel(http_server_client, cpp_file_url):
+
     response = await http_server_client.fetch(cpp_file_url)
     assert response.code == 200
     assert 'Hello Voilà, from c++' in response.body.decode('utf-8')

tests/app/execute_test.py

@@ -11,8 +11,8 @@
     import mock
 
 
-async def test_hello_world(http_server_client, base_url, wait_for_kernel):
-    await wait_for_kernel()
+async def test_hello_world(http_server_client, base_url):
+
     response = await http_server_client.fetch(base_url)
     assert response.code == 200
     html_text = response.body.decode('utf-8')
@@ -21,8 +21,8 @@ async def test_hello_world(http_server_client, base_url, wait_for_kernel):
     assert 'test_template.css' not in html_text, "test_template should not be the default"
 
 
-async def test_no_execute_allowed(voila_app, app, http_server_client, base_url, http_server_port, wait_for_kernel):
-    await wait_for_kernel()
+async def test_no_execute_allowed(voila_app, app, http_server_client, base_url, http_server_port):
+
     assert voila_app.app is app
     response = (await http_server_client.fetch(base_url)).body.decode('utf-8')
     pattern = r"""kernelId": ["']([0-9a-zA-Z-]+)["']"""

tests/app/image_inlining_test.py

@@ -13,8 +13,8 @@ def voila_notebook(notebook_directory):
     return os.path.join(notebook_directory, NOTEBOOK_PATH)
 
 
-async def test_image_inlining(http_server_client, base_url, notebook_directory, wait_for_kernel):
-    await wait_for_kernel()
+async def test_image_inlining(http_server_client, base_url, notebook_directory):
+
     response = await http_server_client.fetch(base_url)
     html_text = response.body.decode('utf-8')
 

tests/app/kernel_death_test.py

@@ -13,8 +13,13 @@ def voila_args_extra():
     return ['--debug']
 
 
-async def test_kernel_death(http_server_client, base_url, wait_for_kernel):
-    await wait_for_kernel()
+@pytest.fixture
+def preheat_mode():
+    return False
+
+
+async def test_kernel_death(http_server_client, base_url):
+
     response = await http_server_client.fetch(base_url)
     html_text = response.body.decode('utf-8')
     assert 'raise DeadKernelError' in html_text

tests/app/nbextensions_test.py

@@ -22,8 +22,8 @@ def voila_config_file_paths_arg():
     return '--VoilaTest.config_file_paths=[%r]' % path
 
 
-async def test_lists_extension(http_server_client, base_url, wait_for_kernel):
-    await wait_for_kernel()
+async def test_lists_extension(http_server_client, base_url):
+
     response = await http_server_client.fetch(base_url)
     assert response.code == 200
     html_text = response.body.decode('utf-8')

tests/app/no_kernelspec_test.py

@@ -1,29 +1,22 @@
 import pytest
-import os
-
 
 NOTEBOOK_PATH = 'no_kernelspec.ipynb'
 
 
 @pytest.fixture
-def non_existing_kernel_notebook(base_url, preheat_mode):
-    if preheat_mode:
-        return base_url
+def non_existing_kernel_notebook(base_url):
     return base_url + f"voila/render/{NOTEBOOK_PATH}"
 
 
 @pytest.fixture
-def voila_args(notebook_directory, voila_args_extra, preheat_mode):
-    if preheat_mode:
-        return [os.path.join(notebook_directory, NOTEBOOK_PATH)] + voila_args_extra
-
+def voila_args(notebook_directory, voila_args_extra):
     return ['--VoilaTest.root_dir=%r' % notebook_directory] + voila_args_extra
 
 
 async def test_non_existing_kernel(http_server_client,
                                    non_existing_kernel_notebook,
-                                   wait_for_kernel):
-    await wait_for_kernel()
+                                   ):
+
     response = await http_server_client.fetch(non_existing_kernel_notebook)
     assert response.code == 200
     assert 'Executing without a kernelspec' in response.body.decode('utf-8')

tests/app/no_metadata.py

@@ -1,27 +1,23 @@
 import pytest
-import os
+
 
 NOTEBOOK_PATH = 'no_metadata.ipynb'
 
 
 @pytest.fixture
-def non_existing_notebook_metadata(base_url, preheat_mode):
-    if preheat_mode:
-        return base_url
+def non_existing_notebook_metadata(base_url):
     return base_url + f'voila/render/{NOTEBOOK_PATH}'
 
 
 @pytest.fixture
-def voila_args(notebook_directory, voila_args_extra, preheat_mode):
-    if preheat_mode:
-        return [os.path.join(notebook_directory, NOTEBOOK_PATH)] + voila_args_extra
+def voila_args(notebook_directory, voila_args_extra):
     return ['--VoilaTest.root_dir=%r' % notebook_directory] + voila_args_extra
 
 
 async def test_non_existing_metadata(
-    http_server_client, non_existing_notebook_metadata, wait_for_kernel
+    http_server_client, non_existing_notebook_metadata
 ):
-    await wait_for_kernel()
+
     response = await http_server_client.fetch(non_existing_notebook_metadata)
     assert response.code == 200
     assert 'Executing without notebook metadata' in response.body.decode('utf-8')

tests/app/no_strip_sources_test.py

@@ -11,8 +11,8 @@ def voila_args_extra():
     return ['--VoilaConfiguration.strip_sources=False', '--VoilaExecutor.timeout=240']
 
 
-async def test_no_strip_sources(http_server_client, base_url, wait_for_kernel):
-    await wait_for_kernel()
+async def test_no_strip_sources(http_server_client, base_url):
+
     response = await http_server_client.fetch(base_url)
     assert response.code == 200
     html_text = response.body.decode('utf-8')

tests/app/non_existing_kernel_test.py

@@ -1,27 +1,21 @@
 import pytest
-import os
-
 NOTEBOOK_PATH = "non_existing_kernel.ipynb"
 
 
 @pytest.fixture
-def non_existing_kernel_notebook(base_url, preheat_mode):
-    if preheat_mode:
-        return base_url
+def non_existing_kernel_notebook(base_url):
     return base_url + f"voila/render/{NOTEBOOK_PATH}"
 
 
 @pytest.fixture
-def voila_args(notebook_directory, voila_args_extra, preheat_mode):
-    if preheat_mode:
-        return [os.path.join(notebook_directory, NOTEBOOK_PATH)] + voila_args_extra
+def voila_args(notebook_directory, voila_args_extra):
     return ["--VoilaTest.root_dir=%r" % notebook_directory] + voila_args_extra
 
 
 async def test_non_existing_kernel(
-    http_server_client, non_existing_kernel_notebook, wait_for_kernel
+    http_server_client, non_existing_kernel_notebook
 ):
-    await wait_for_kernel()
+
     response = await http_server_client.fetch(non_existing_kernel_notebook)
     assert response.code == 200
     assert "non-existing kernel" in response.body.decode("utf-8")

tests/app/notebooks_test.py

@@ -1,34 +1,26 @@
 # simply tests if some notebooks execute
 import pytest
-import os
 
 NOTEBOOK_PATH = 'other_comms.ipynb'
 
 
 @pytest.fixture
-def notebook_other_comms_path(base_url, preheat_mode):
-    if preheat_mode:
-        return base_url
+def notebook_other_comms_path(base_url):
     return base_url + f'voila/render/{NOTEBOOK_PATH}'
 
 
 @pytest.fixture
-def voila_args(notebook_directory, voila_args_extra, preheat_mode):
-    if preheat_mode:
-        return [
-            os.path.join(notebook_directory, NOTEBOOK_PATH),
-            '--VoilaTest.log_level=DEBUG',
-        ] + voila_args_extra
+def voila_args(notebook_directory, voila_args_extra):
     return [
         '--VoilaTest.root_dir=%r' % notebook_directory,
         '--VoilaTest.log_level=DEBUG',
     ] + voila_args_extra
 
 
 async def test_other_comms(
-    http_server_client, notebook_other_comms_path, wait_for_kernel
+    http_server_client, notebook_other_comms_path
 ):
-    await wait_for_kernel()
+
     response = await http_server_client.fetch(notebook_other_comms_path)
     html_text = response.body.decode('utf-8')
     assert 'This notebook executed' in html_text