Skip to content

Commit 756368c

Browse files
authored
Merge pull request voila-dashboards#1036 from trungleduc/fix-ci-script
Fix CI problem of preheated kernels tests
2 parents 02f99aa + 7304b66 commit 756368c

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

.github/workflows/ui-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Node
2222
uses: actions/setup-node@v1
2323
with:
24-
node-version: '14.x'
24+
node-version: '16.x'
2525

2626
- name: Cache pip on Linux
2727
uses: actions/cache@v2

tests/app/preheat_activation_test.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ async def test_request_before_kernel_heated(http_server_client, base_url):
3636
time, text = await send_request(sc=http_server_client, url=base_url)
3737
assert 'hello world' in text
3838
assert time > NOTEBOOK_EXECUTION_TIME
39+
await asyncio.sleep(NOTEBOOK_EXECUTION_TIME + 1)
3940

4041

4142
async def test_render_time_with_preheated_kernel(http_server_client, base_url):
@@ -48,6 +49,7 @@ async def test_render_time_with_preheated_kernel(http_server_client, base_url):
4849
wait=NOTEBOOK_EXECUTION_TIME + 2)
4950
assert 'hello world' in text
5051
assert time < TIME_THRESHOLD
52+
await asyncio.sleep(NOTEBOOK_EXECUTION_TIME + 1)
5153

5254

5355
async def test_render_time_with_multiple_requests(http_server_client,
@@ -65,6 +67,7 @@ async def test_render_time_with_multiple_requests(http_server_client,
6567
time_list.append(time)
6668

6769
assert time_list[1] > time_list[0] # Render time for a normal kernel is bigger than a a preheated kernel
70+
await asyncio.sleep(NOTEBOOK_EXECUTION_TIME + 1)
6871

6972

7073
async def test_request_with_query(http_server_client, base_url):
@@ -77,6 +80,7 @@ async def test_request_with_query(http_server_client, base_url):
7780
url=url,
7881
wait=NOTEBOOK_EXECUTION_TIME + 1)
7982
assert time < TIME_THRESHOLD
83+
await asyncio.sleep(NOTEBOOK_EXECUTION_TIME + 1)
8084

8185

8286
async def test_request_with_theme_parameter(http_server_client, base_url):

tests/app/preheat_configuration_test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55

66
BASE_DIR = os.path.dirname(__file__)
7-
NOTEBOOK_EXECUTION_TIME = 2
7+
NOTEBOOK_EXECUTION_TIME = 3
88
NUMBER_PREHEATED_KERNEL = 2
99
TIME_THRESHOLD = 1
1010

@@ -48,9 +48,11 @@ async def test_refill_kernel_asynchronously(http_server_client, base_url):
4848
assert len(fast) > 1
4949
assert len(slow) > 1
5050
assert len(fast) + len(slow) == 5*NUMBER_PREHEATED_KERNEL
51+
await asyncio.sleep(NOTEBOOK_EXECUTION_TIME + 1)
5152

5253

5354
async def test_env_variable_defined_in_kernel(http_server_client, base_url):
5455
await asyncio.sleep(NUMBER_PREHEATED_KERNEL*NOTEBOOK_EXECUTION_TIME + 1)
5556
_, text = await send_request(sc=http_server_client, url=base_url)
5657
assert "bar" in text
58+
await asyncio.sleep(NOTEBOOK_EXECUTION_TIME + 1)

tests/app/preheat_multiple_notebooks_test.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ async def test_render_notebook_with_heated_kernel(http_server_client, base_url):
4040

4141
assert 'hello world' in text
4242
assert time < TIME_THRESHOLD
43+
await asyncio.sleep(NOTEBOOK_EXECUTION_TIME + 1)
4344

4445

4546
async def test_render_blacklisted_notebook_with_nornal_kernel(http_server_client, base_url):
@@ -48,3 +49,4 @@ async def test_render_blacklisted_notebook_with_nornal_kernel(http_server_client
4849

4950
assert 'hello world' in text
5051
assert time > TIME_THRESHOLD
52+
await asyncio.sleep(NOTEBOOK_EXECUTION_TIME + 1)

voila/voila_kernel_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ async def get_rendered_notebook(
146146
render_task: asyncio.Task = content['task']
147147
kernel_id: str = content['kernel_id']
148148
renderer.stop_generator = True
149-
self.log.info('Using pre-heated kernel: %s for %s', 'kernel_id', notebook_name)
149+
self.log.info('Using pre-heated kernel: %s for %s', kernel_id, notebook_name)
150150
self.fill_if_needed(delay=None, notebook_name=notebook_name, **kwargs)
151151

152152
return render_task, renderer.rendered_cache, kernel_id

0 commit comments

Comments
 (0)