From 825c9ea2c3e195bcaa31466be9d103b1a4817503 Mon Sep 17 00:00:00 2001 From: Benoit Seignovert Date: Fri, 8 Mar 2024 10:42:39 +0100 Subject: [PATCH] Enforce workspace reset on new lab --- src/glicid_spawner/spawner.py | 2 +- tests/test_spawner.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/glicid_spawner/spawner.py b/src/glicid_spawner/spawner.py index 0391b42..f3f6853 100644 --- a/src/glicid_spawner/spawner.py +++ b/src/glicid_spawner/spawner.py @@ -26,7 +26,7 @@ class GlicidSpawner(SlurmSpawner): @default('default_url') def _default_url_default(self) -> str: """The URL the single-user server should start in.""" - return '/lab/tree' + self.user_options.get('workdir', '/home/{username}') + return '/lab/tree' + self.user_options.get('workdir', '/home/{username}') + '?reset' batchspawner_singleuser_cmd = Unicode( 'glicid-spawner-singleuser', diff --git a/tests/test_spawner.py b/tests/test_spawner.py index 75ffedb..fb84036 100644 --- a/tests/test_spawner.py +++ b/tests/test_spawner.py @@ -23,7 +23,7 @@ def test_spawner_config(): assert spawner.disable_user_config assert spawner.notebook_dir == '/' - assert spawner.default_url == '/lab/tree/home/{username}' + assert spawner.default_url == '/lab/tree/home/{username}?reset' assert spawner.req_job_name == 'jupyterhub_glicid' assert spawner.req_qos == 'short' assert spawner.progress_rate == 10 @@ -58,7 +58,7 @@ def test_spawner_options_form(monkeypatch): spawner = GlicidSpawner(user_options={'workdir': '/LAB-DATA'}) - assert spawner.default_url == '/lab/tree/LAB-DATA' + assert spawner.default_url == '/lab/tree/LAB-DATA?reset' @pytest.mark.asyncio