diff --git a/.github/integration-test.py b/.github/integration-test.py index 73ef8ba..0ceed6a 100755 --- a/.github/integration-test.py +++ b/.github/integration-test.py @@ -10,7 +10,7 @@ GIT_REPO_PATH = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) TEST_IMAGE_NAME = "test-systemd" -@functools.lru_cache() +@functools.lru_cache def _get_container_runtime_cli(): runtimes = ["docker", "podman"] for runtime in runtimes: diff --git a/integration-tests/test_extensions.py b/integration-tests/test_extensions.py index 661432b..0e4c2c8 100644 --- a/integration-tests/test_extensions.py +++ b/integration-tests/test_extensions.py @@ -29,8 +29,7 @@ def test_labextensions(): # jupyter-labextension writes to stdout and stderr weirdly proc = subprocess.run( ["/opt/tljh/user/bin/jupyter-labextension", "list"], - stderr=subprocess.PIPE, - stdout=subprocess.PIPE, + capture_output=True, ) extensions = [ diff --git a/tests/test_config.py b/tests/test_config.py index 72cf65e..2d6ded4 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -143,18 +143,21 @@ def test_remove_from_config_error(): def test_reload_hub(): - with mock.patch("tljh.systemd.restart_service") as restart_service, mock.patch( - "tljh.systemd.check_service_active" - ) as check_active, mock.patch("tljh.config.check_hub_ready") as check_ready: + with ( + mock.patch("tljh.systemd.restart_service") as restart_service, + mock.patch("tljh.systemd.check_service_active") as check_active, + mock.patch("tljh.config.check_hub_ready") as check_ready, + ): config.reload_component("hub") restart_service.assert_called_with("jupyterhub") check_active.assert_called_with("jupyterhub") def test_reload_proxy(tljh_dir): - with mock.patch("tljh.systemd.restart_service") as restart_service, mock.patch( - "tljh.systemd.check_service_active" - ) as check_active: + with ( + mock.patch("tljh.systemd.restart_service") as restart_service, + mock.patch("tljh.systemd.check_service_active") as check_active, + ): config.reload_component("proxy") restart_service.assert_called_with("traefik") check_active.assert_called_with("traefik")