Skip to content

Commit d57bf95

Browse files
authored
Adjust sleep times (#2080)
* Adjust sleep times * Update test_start_container.py * Update test_healthcheck.py * Update pluto_check.py
1 parent 86dc0f2 commit d57bf95

File tree

3 files changed

+17
-23
lines changed

3 files changed

+17
-23
lines changed

images/base-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ RUN fix-permissions /etc/jupyter/
6868
# HEALTHCHECK documentation: https://docs.docker.com/engine/reference/builder/#healthcheck
6969
# This healtcheck works well for `lab`, `notebook`, `nbclassic`, `server`, and `retro` jupyter commands
7070
# https://github.com/jupyter/docker-stacks/issues/915#issuecomment-1068528799
71-
HEALTHCHECK --interval=5s --timeout=3s --start-period=5s --retries=3 \
71+
HEALTHCHECK --interval=3s --timeout=1s --start-period=3s --retries=3 \
7272
CMD /etc/jupyter/docker_healthcheck.py || exit 1
7373

7474
# Switch back to jovyan to avoid accidental container runs as root

tests/base-notebook/test_healthcheck.py

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,11 @@ def test_healthy(
6767
user=user,
6868
)
6969

70-
# sleeping some time to let the server start
71-
time_spent = 0.0
72-
wait_time = 0.1
73-
time_limit = 15
74-
while time_spent < time_limit:
75-
time.sleep(wait_time)
76-
time_spent += wait_time
70+
# giving some time to let the server start
71+
finish_time = time.time() + 10
72+
sleep_time = 0.1
73+
while time.time() < finish_time:
74+
time.sleep(sleep_time)
7775
if get_health(running_container) == "healthy":
7876
return
7977

@@ -114,13 +112,11 @@ def test_healthy_with_proxy(
114112
user=user,
115113
)
116114

117-
# sleeping some time to let the server start
118-
time_spent = 0.0
119-
wait_time = 0.1
120-
time_limit = 15
121-
while time_spent < time_limit:
122-
time.sleep(wait_time)
123-
time_spent += wait_time
115+
# giving some time to let the server start
116+
finish_time = time.time() + 10
117+
sleep_time = 0.1
118+
while time.time() < finish_time:
119+
time.sleep(sleep_time)
124120
if get_health(running_container) == "healthy":
125121
return
126122

@@ -152,13 +148,11 @@ def test_not_healthy(
152148
command=cmd,
153149
)
154150

155-
# sleeping some time to let the server start
156-
time_spent = 0.0
157-
wait_time = 0.1
158-
time_limit = 15
159-
while time_spent < time_limit:
160-
time.sleep(wait_time)
161-
time_spent += wait_time
151+
# giving some time to let the server start
152+
finish_time = time.time() + 5
153+
sleep_time = 0.1
154+
while time.time() < finish_time:
155+
time.sleep(sleep_time)
162156
if get_health(running_container) == "healthy":
163157
raise RuntimeError("Container should not be healthy for this testcase")
164158

tests/pluto_check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def check_pluto_proxy(
2424
ports={"8888/tcp": host_port},
2525
)
2626
# Give the server a bit of time to start
27-
time.sleep(3)
27+
time.sleep(2)
2828
resp = http_client.get(f"http://localhost:{host_port}/pluto?token={token}")
2929
resp.raise_for_status()
3030
assert "Pluto.jl notebooks" in resp.text, "Pluto.jl text not found in /pluto page"

0 commit comments

Comments
 (0)