diff --git a/tests/test_config.py b/tests/test_config.py index 9b1dc1d..ce61330 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -128,9 +128,7 @@ def test_reload_hub(): 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, mock.patch( - "tljh.configurer.generate_traefik_api_credentials" - ) as generate_credentials: + ) as check_active: config.reload_component('proxy') assert restart_service.called_with('traefik') assert check_active.called_with('traefik') @@ -153,44 +151,29 @@ def test_cli_no_command(capsys): ) def test_cli_set_bool(tljh_dir, arg, value): config.main(["set", "https.enabled", arg]) - with mock.patch( - "tljh.configurer.generate_traefik_api_credentials" - ) as generate_credentials: - cfg = configurer.load_config() + cfg = configurer.load_config() assert cfg['https']['enabled'] == value def test_cli_set_int(tljh_dir): config.main(["set", "https.port", "123"]) - with mock.patch( - "tljh.configurer.generate_traefik_api_credentials" - ) as generate_credentials: - cfg = configurer.load_config() + cfg = configurer.load_config() assert cfg['https']['port'] == 123 def test_cli_add_float(tljh_dir): config.main(["add-item", "foo.bar", "1.25"]) - with mock.patch( - "tljh.configurer.generate_traefik_api_credentials" - ) as generate_credentials: - cfg = configurer.load_config() + cfg = configurer.load_config() assert cfg['foo']['bar'] == [1.25] def test_cli_remove_int(tljh_dir): config.main(["add-item", "foo.bar", "1"]) config.main(["add-item", "foo.bar", "2"]) - with mock.patch( - "tljh.configurer.generate_traefik_api_credentials" - ) as generate_credentials: - cfg = configurer.load_config() + cfg = configurer.load_config() assert cfg['foo']['bar'] == [1, 2] config.main(["remove-item", "foo.bar", "1"]) - with mock.patch( - "tljh.configurer.generate_traefik_api_credentials" - ) as generate_credentials: - cfg = configurer.load_config() + cfg = configurer.load_config() assert cfg['foo']['bar'] == [2] diff --git a/tests/test_traefik.py b/tests/test_traefik.py index 633127f..4ef9065 100644 --- a/tests/test_traefik.py +++ b/tests/test_traefik.py @@ -18,10 +18,7 @@ def test_download_traefik(tmpdir): def test_default_config(tmpdir, tljh_dir): state_dir = tmpdir.mkdir("state") - with mock.patch( - "tljh.configurer.generate_traefik_api_credentials" - ) as generate_credentials: - traefik.ensure_traefik_config(str(state_dir)) + traefik.ensure_traefik_config(str(state_dir)) assert state_dir.join("traefik.toml").exists() traefik_toml = os.path.join(state_dir, "traefik.toml") with open(traefik_toml) as f: @@ -56,10 +53,7 @@ def test_letsencrypt_config(tljh_dir): config.set_config_value( config.CONFIG_FILE, "https.letsencrypt.domains", ["testing.jovyan.org"] ) - with mock.patch( - "tljh.configurer.generate_traefik_api_credentials" - ) as generate_credentials: - traefik.ensure_traefik_config(str(state_dir)) + traefik.ensure_traefik_config(str(state_dir)) traefik_toml = os.path.join(state_dir, "traefik.toml") with open(traefik_toml) as f: toml_cfg = f.read() @@ -98,10 +92,7 @@ def test_manual_ssl_config(tljh_dir): config.set_config_value(config.CONFIG_FILE, "https.enabled", True) config.set_config_value(config.CONFIG_FILE, "https.tls.key", "/path/to/ssl.key") config.set_config_value(config.CONFIG_FILE, "https.tls.cert", "/path/to/ssl.cert") - with mock.patch( - "tljh.configurer.generate_traefik_api_credentials" - ) as generate_credentials: - traefik.ensure_traefik_config(str(state_dir)) + traefik.ensure_traefik_config(str(state_dir)) traefik_toml = os.path.join(state_dir, "traefik.toml") with open(traefik_toml) as f: toml_cfg = f.read()