Skip to content

Commit 4db54c0

Browse files
gh-7: Test configuration layer precedence and file loading (#443)
1 parent b6343b2 commit 4db54c0

1 file changed

Lines changed: 85 additions & 0 deletions

File tree

‎tests/test_config.py‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import json
12
import os
23
import pytest
34

@@ -11,6 +12,8 @@
1112
config_dict_merge,
1213
config_split,
1314
config_split_append,
15+
load_config,
16+
load_one_config,
1417
merge_config,
1518
resolve_config,
1619
sanitise_config,
@@ -379,3 +382,85 @@ def test_config_sanitise_nested(assert_log):
379382
}
380383
actual = sanitise_config(cfg, schema)
381384
assert actual == expect
385+
386+
387+
@pytest.mark.parametrize("registry_override", [False, True])
388+
@pytest.mark.parametrize("explicit_override", [False, True])
389+
def test_load_config_layer_precedence(tmp_path, monkeypatch, registry_override, explicit_override):
390+
schema = {
391+
"base_config": (str, None),
392+
"user_config": (str, None),
393+
"additional_config": (str, None),
394+
"registry_override_key": (str, None),
395+
"_config_files": (str, config_append),
396+
"value": (str, config_append),
397+
"layers": {name: (str, None) for name in ("base", "user", "additional", "override")},
398+
}
399+
files = {}
400+
for name in ("base", "user", "additional", "override"):
401+
file = tmp_path / f"{name}.json"
402+
file.write_text(json.dumps({"value": name, "layers": {name: name}}), encoding="utf-8")
403+
files[name] = file
404+
405+
def global_config(cfg, schema):
406+
cfg.update({
407+
"registry_override_key": "test-only",
408+
"base_config": files["base"],
409+
"user_config": files["user"],
410+
"additional_config": files["additional"],
411+
"value": "global",
412+
})
413+
414+
def registry_config(key, schema):
415+
assert key == "test-only"
416+
return {"value": "registry"} if registry_override else {}
417+
418+
monkeypatch.setattr("manage.config.load_global_config", global_config)
419+
monkeypatch.setattr("manage.config.load_registry_config", registry_config)
420+
override = files["override"] if explicit_override else None
421+
actual = load_config(tmp_path, override, schema)
422+
423+
if explicit_override:
424+
expected = "override"
425+
elif registry_override:
426+
expected = "registry"
427+
else:
428+
expected = ["base", "user", "additional"]
429+
assert actual["value"] == expected
430+
names = ["base", "user", "additional"]
431+
if explicit_override:
432+
names.append("override")
433+
assert actual["layers"] == {name: name for name in names}
434+
if explicit_override:
435+
expected_files = str(files["override"])
436+
else:
437+
expected_files = [str(files[name]) for name in names]
438+
assert actual["_config_files"] == expected_files
439+
440+
441+
@pytest.mark.parametrize("contents", [None, "{invalid json"], ids=["missing", "invalid-json"])
442+
def test_load_one_config_failed_layer_preserves_values(tmp_path, contents):
443+
schema = {"value": (str, None), "_config_files": (str, config_append)}
444+
file = tmp_path / "config.json"
445+
if contents is not None:
446+
file.write_text(contents, encoding="utf-8")
447+
cfg = {"value": "earlier", "_config_files": ["earlier.json"]}
448+
449+
load_one_config(cfg, file, schema, overwrite=True)
450+
451+
assert cfg == {"value": "earlier", "_config_files": ["earlier.json"]}
452+
453+
454+
def test_load_one_config_bom_and_relative_path(tmp_path, monkeypatch):
455+
config_dir = tmp_path / "configuration"
456+
config_dir.mkdir()
457+
file = config_dir / "config.json"
458+
file.write_text(json.dumps({"download_dir": "cache"}), encoding="utf-8-sig")
459+
monkeypatch.chdir(tmp_path)
460+
schema = {"download_dir": (str, None, "path"), "_config_files": (str, config_append)}
461+
cfg = {}
462+
463+
load_one_config(cfg, file, schema)
464+
465+
assert cfg["download_dir"] == config_dir / "cache"
466+
assert cfg["_config_files"] == str(file)

0 commit comments

Comments
 (0)