Skip to content

Commit 38a01e8

Browse files
committed
Use default true for validate
1 parent 9bcfa70 commit 38a01e8

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

integration-tests/test_proxy.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ def test_manual_https(preserve_config):
6363
"/CN=tljh.jupyer.org",
6464
]
6565
)
66-
set_config_value(CONFIG_FILE, "https.enabled", True, True)
67-
set_config_value(CONFIG_FILE, "https.tls.key", key, True)
68-
set_config_value(CONFIG_FILE, "https.tls.cert", cert, True)
66+
set_config_value(CONFIG_FILE, "https.enabled", True)
67+
set_config_value(CONFIG_FILE, "https.tls.key", key)
68+
set_config_value(CONFIG_FILE, "https.tls.cert", cert)
6969
reload_component("proxy")
7070
for i in range(10):
7171
time.sleep(i)
@@ -89,7 +89,7 @@ def test_manual_https(preserve_config):
8989

9090
# cleanup
9191
shutil.rmtree(ssl_dir)
92-
set_config_value(CONFIG_FILE, "https.enabled", False, True)
92+
set_config_value(CONFIG_FILE, "https.enabled", False)
9393

9494
reload_component("proxy")
9595

tests/test_traefik.py

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ def test_default_config(tmpdir, tljh_dir):
6464

6565
def test_letsencrypt_config(tljh_dir):
6666
state_dir = config.STATE_DIR
67-
config.set_config_value(config.CONFIG_FILE, "https.enabled", True, True)
67+
config.set_config_value(config.CONFIG_FILE, "https.enabled")
6868
config.set_config_value(
69-
config.CONFIG_FILE, "https.letsencrypt.email", "[email protected]", True
69+
config.CONFIG_FILE, "https.letsencrypt.email", "[email protected]"
7070
)
7171
config.set_config_value(
72-
config.CONFIG_FILE, "https.letsencrypt.domains", ["testing.jovyan.org"], True
72+
config.CONFIG_FILE, "https.letsencrypt.domains", ["testing.jovyan.org"]
7373
)
7474
traefik.ensure_traefik_config(str(state_dir))
7575

@@ -138,13 +138,9 @@ def test_letsencrypt_config(tljh_dir):
138138

139139
def test_manual_ssl_config(tljh_dir):
140140
state_dir = config.STATE_DIR
141-
config.set_config_value(config.CONFIG_FILE, "https.enabled", True, True)
142-
config.set_config_value(
143-
config.CONFIG_FILE, "https.tls.key", "/path/to/ssl.key", True
144-
)
145-
config.set_config_value(
146-
config.CONFIG_FILE, "https.tls.cert", "/path/to/ssl.cert", True
147-
)
141+
config.set_config_value(config.CONFIG_FILE, "https.enabled", True)
142+
config.set_config_value(config.CONFIG_FILE, "https.tls.key", "/path/to/ssl.key")
143+
config.set_config_value(config.CONFIG_FILE, "https.tls.cert", "/path/to/ssl.cert")
148144
traefik.ensure_traefik_config(str(state_dir))
149145

150146
cfg = _read_static_config(state_dir)
@@ -248,16 +244,12 @@ def test_extra_config(tmpdir, tljh_dir):
248244

249245
def test_listen_address(tmpdir, tljh_dir):
250246
state_dir = config.STATE_DIR
251-
config.set_config_value(config.CONFIG_FILE, "https.enabled", True, True)
252-
config.set_config_value(
253-
config.CONFIG_FILE, "https.tls.key", "/path/to/ssl.key", True
254-
)
255-
config.set_config_value(
256-
config.CONFIG_FILE, "https.tls.cert", "/path/to/ssl.cert", True
257-
)
247+
config.set_config_value(config.CONFIG_FILE, "https.enabled", True)
248+
config.set_config_value(config.CONFIG_FILE, "https.tls.key", "/path/to/ssl.key")
249+
config.set_config_value(config.CONFIG_FILE, "https.tls.cert", "/path/to/ssl.cert")
258250

259-
config.set_config_value(config.CONFIG_FILE, "http.address", "127.0.0.1", True)
260-
config.set_config_value(config.CONFIG_FILE, "https.address", "127.0.0.1", True)
251+
config.set_config_value(config.CONFIG_FILE, "http.address", "127.0.0.1")
252+
config.set_config_value(config.CONFIG_FILE, "https.address", "127.0.0.1")
261253

262254
traefik.ensure_traefik_config(str(state_dir))
263255

0 commit comments

Comments
 (0)