mig5/enroll
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Activity Actions

Remove reference to --jinjaturtle auto/on/off (it's a boolean arg). Fix alma python
All checks were successful
CI / test (push) Successful in 53s
Details
CI / test (almalinux, docker.io/library/almalinux:9, python3.11) (push) Successful in 10m44s
Details
CI / test (debian, docker.io/library/debian:13, python3) (push) Successful in 16m3s
Details
Lint / test (push) Successful in 46s
Details

Browse source
This commit is contained in:
Miguel Jacq 2026-06-30 12:34:26 +10:00
parent e72044b610
commit 85345083a3
Signed by: mig5
GPG key ID: 03906B4110AAD3B8
10 changed files with 76 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/test_cli.py
View file

@ -67,7 +67,7 @@ def test_cli_manifest_subcommand_calls_manifest(monkeypatch, tmp_path):
assert called["harvest"] == str(tmp_path / "bundle")
assert called["out"] == str(tmp_path / "ansible")
assert called["fqdn"] is None
assert called["jinjaturtle"] == "auto"
assert called["jinjaturtle"] is None
assert called["no_common_roles"] is False
@ -202,7 +202,7 @@ def test_cli_enroll_subcommand_runs_harvest_then_manifest(monkeypatch, tmp_path)
cli.main()
assert calls == [
("harvest", str(tmp_path / "bundle"), False, [], []),
("manifest", str(tmp_path / "bundle"), str(tmp_path / "ansible"), None, "auto"),
("manifest", str(tmp_path / "bundle"), str(tmp_path / "ansible"), None, None),
]
@ -491,7 +491,7 @@ def test_cli_manifest_common_args(monkeypatch, tmp_path):
cli.main()
assert called["fqdn"] == "example.test"
assert called["jinjaturtle"] == "off"
assert called["jinjaturtle"] is False
def test_cli_explain_passes_args_and_writes_stdout(monkeypatch, capsys, tmp_path):

2
tests/test_jinjaturtle.py
View file

@ -127,7 +127,7 @@ def test_manifest_uses_jinjaturtle_templates_and_does_not_copy_raw(
monkeypatch.setattr(jinjaturtle_mod, "run_jinjaturtle", fake_run_jinjaturtle)
manifest_mod.manifest(str(bundle), str(out), jinjaturtle="on")
manifest_mod.manifest(str(bundle), str(out), jinjaturtle=True)
role_dir = out / "roles" / "utils"

2
tests/test_manifest.py
View file

@ -1541,7 +1541,7 @@ def test_manifest_applies_jinjaturtle_to_jinjifyable_managed_file(
monkeypatch.setattr(jinjaturtle_mod, "run_jinjaturtle", lambda *a, **k: _Res())
out_dir = tmp_path / "out"
manifest.manifest(str(bundle), str(out_dir), jinjaturtle="on")
manifest.manifest(str(bundle), str(out_dir), jinjaturtle=True)
tmpl = out_dir / "roles" / "apt_config" / "templates" / "etc" / "apt" / "foo.ini.j2"
assert tmpl.exists()