diff --git a/frontend/ui-tests/tests/ui.test.ts-snapshots/environment-dialog-linux.png b/frontend/ui-tests/tests/ui.test.ts-snapshots/environment-dialog-linux.png index 4a2e3b0..a4344db 100644 Binary files a/frontend/ui-tests/tests/ui.test.ts-snapshots/environment-dialog-linux.png and b/frontend/ui-tests/tests/ui.test.ts-snapshots/environment-dialog-linux.png differ diff --git a/jupyterhub_config.py b/jupyterhub_config.py index 6d92bbb..8502436 100644 --- a/jupyterhub_config.py +++ b/jupyterhub_config.py @@ -11,10 +11,11 @@ c.JupyterHub.services = [] -# set default limits in the TLJH config in memory tljh_config = load_config() -tljh_config["limits"]["memory"] = "2G" -tljh_config["limits"]["cpu"] = 2 + +# set default limits in the TLJH config in memory +# tljh_config["limits"]["memory"] = "2G" +# tljh_config["limits"]["cpu"] = 2 # set CPU and memory based on machine profiles tljh_config["limits"]["machine_profiles"] = [ diff --git a/tljh_repo2docker/tests/test_images.py b/tljh_repo2docker/tests/test_images.py index 5ea49a6..ab6617a 100644 --- a/tljh_repo2docker/tests/test_images.py +++ b/tljh_repo2docker/tests/test_images.py @@ -10,7 +10,7 @@ async def test_images_list_admin(app): cookies = await app.login_user('admin') r = await get_page('environments', app, cookies=cookies, allow_redirects=False) r.raise_for_status() - assert '{"images": [], "default_mem_limit": "None", "default_cpu_limit":"None"}' in r.text + assert '{"images": [], "default_mem_limit": "None", "default_cpu_limit":"None", "machine_profiles":[]}' in r.text @pytest.mark.asyncio