zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

test refactor: reduce time spent waiting on culling/not culling

Browse Source
This commit is contained in:
Erik Sundell
2023-06-09 01:48:00 +02:00
parent 3e9ee8ca8f
commit 1d203ccd2a
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
integration-tests/test_hub.py
View File

@@ -260,7 +260,7 @@ async def test_user_group_adding():
async def test_idle_server_culled(): async def test_idle_server_culled():
""" """
User logs in, starts a server & stays idle for 1 min. User logs in, starts a server & stays idle for a while.
(the user's server should be culled during this period) (the user's server should be culled during this period)
""" """
username = secrets.token_hex(8) username = secrets.token_hex(8)
@@ -291,12 +291,12 @@ async def test_idle_server_culled():
) )
).wait() ).wait()
) )
# Cull servers and users after 30s, regardless of activity # Cull servers and users after a while, regardless of activity
assert ( assert (
0 0
== await ( == await (
await asyncio.create_subprocess_exec( await asyncio.create_subprocess_exec(
*TLJH_CONFIG_PATH, "set", "services.cull.max_age", "30" *TLJH_CONFIG_PATH, "set", "services.cull.max_age", "15"
) )
).wait() ).wait()
) )
@@ -349,7 +349,7 @@ async def test_idle_server_culled():
# Wait for culling # Wait for culling
# step 1: check if the server is still running # step 1: check if the server is still running
timeout = 100 timeout = 30
async def server_stopped(): async def server_stopped():
"""Has the server been stopped?""" """Has the server been stopped?"""
@@ -365,7 +365,7 @@ async def test_idle_server_culled():
# step 2. wait for user to be deleted # step 2. wait for user to be deleted
async def user_removed(): async def user_removed():
# Check that after 60s, the user has been culled # Check that after a while, the user has been culled
r = await hub_api_request() r = await hub_api_request()
print(f"{r.status} {r.url}") print(f"{r.status} {r.url}")
return r.status == 403 return r.status == 403
@@ -379,7 +379,7 @@ async def test_idle_server_culled():
async def test_active_server_not_culled(): async def test_active_server_not_culled():
""" """
User logs in, starts a server & stays idle for 30s User logs in, starts a server & stays idle for a while
(the user's server should not be culled during this period). (the user's server should not be culled during this period).
""" """
# This *must* be localhost, not an IP # This *must* be localhost, not an IP
@@ -412,12 +412,12 @@ async def test_active_server_not_culled():
) )
).wait() ).wait()
) )
# Cull servers and users after 30s, regardless of activity # Cull servers and users after a while, regardless of activity
assert ( assert (
0 0
== await ( == await (
await asyncio.create_subprocess_exec( await asyncio.create_subprocess_exec(
*TLJH_CONFIG_PATH, "set", "services.cull.max_age", "60" *TLJH_CONFIG_PATH, "set", "services.cull.max_age", "30"
) )
).wait() ).wait()
) )
@@ -441,7 +441,7 @@ async def test_active_server_not_culled():
assert r.status == 200 assert r.status == 200
async def server_has_stopped(): async def server_has_stopped():
# Check that after 30s, we can still reach the user's server # Check that after a while, we can still reach the user's server
r = await u.session.get(user_url, allow_redirects=False) r = await u.session.get(user_url, allow_redirects=False)
print(f"{r.status} {r.url}") print(f"{r.status} {r.url}")
return r.status != 200 return r.status != 200
@@ -450,7 +450,7 @@ async def test_active_server_not_culled():
await exponential_backoff( await exponential_backoff(
server_has_stopped, server_has_stopped,
"User's server is still reachable (good!)", "User's server is still reachable (good!)",
timeout=30, timeout=15,
) )
except asyncio.TimeoutError: except asyncio.TimeoutError:
# timeout error means the test passed - the server didn't go away while we were waiting # timeout error means the test passed - the server didn't go away while we were waiting