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

Fix import of stat_triplet
Some checks failed
CI / test (push) Successful in 49s
Details
CI / test (almalinux, docker.io/library/almalinux:9, python3.11) (push) Failing after 9m3s
Details
CI / test (debian, docker.io/library/debian:13, python3) (push) Failing after 12m13s
Details
Lint / test (push) Successful in 46s
Details

Browse source
This commit is contained in:
Miguel Jacq 2026-06-29 14:51:32 +10:00
parent 3c1e08bdde
commit b546bb9bf2
Signed by: mig5
GPG key ID: 03906B4110AAD3B8
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/test_harvest.py
View file

@ -10,6 +10,7 @@ from enroll.platform import PlatformInfo
from enroll.systemd import UnitInfo
from enroll.pathfilter import PathFilter
import enroll.capture as capture
from enroll.harvest_collectors import paths as path_collectors
from enroll.capture import (
capture_file as _capture_file,
capture_link as _capture_link,
@ -255,7 +256,7 @@ def test_harvest_dedup_manual_packages_and_builds_etc_custom(
# /usr/local/bin/readme.txt remains non-executable
return ("root", "root", "0644")
monkeypatch.setattr(harvest, "stat_triplet", fake_stat_triplet)
monkeypatch.setattr(path_collectors, "stat_triplet", fake_stat_triplet)
monkeypatch.setattr(harvest, "stat_dir_triplet", fake_stat_triplet)
monkeypatch.setattr(capture, "stat_triplet", fake_stat_triplet)
@ -400,7 +401,9 @@ def test_shared_cron_snippet_prefers_matching_role_over_lexicographic(
)
monkeypatch.setattr(harvest, "get_backend", lambda info=None: backend)
monkeypatch.setattr(harvest, "stat_triplet", lambda p: ("root", "root", "0644"))
monkeypatch.setattr(
path_collectors, "stat_triplet", lambda p: ("root", "root", "0644")
)
monkeypatch.setattr(harvest, "stat_dir_triplet", lambda p: ("root", "root", "0755"))
monkeypatch.setattr(capture, "stat_triplet", lambda p: ("root", "root", "0644"))
monkeypatch.setattr(harvest, "collect_non_system_users", lambda: [])

6
tests/test_harvest_collectors.py
View file

@ -285,7 +285,7 @@ def test_extra_paths_collector_records_dirs_files_notes_and_excludes(
)
return True
monkeypatch.setattr(paths.h, "stat_dir_triplet", fake_stat_triplet)
monkeypatch.setattr(paths, "stat_dir_triplet", fake_stat_triplet)
monkeypatch.setattr(paths, "capture_file", lambda *a, **kw: fake_capture_file(**kw))
ctx = _context(
@ -321,7 +321,7 @@ def test_extra_paths_collector_skips_already_captured_files(monkeypatch, tmp_pat
file_path.write_text("ok", encoding="utf-8")
calls: list[str] = []
monkeypatch.setattr(paths.h, "stat_dir_triplet", lambda p: ("root", "root", "0755"))
monkeypatch.setattr(paths, "stat_dir_triplet", lambda p: ("root", "root", "0755"))
monkeypatch.setattr(
paths, "capture_file", lambda *a, **kw: calls.append(kw["abs_path"]) or True
)
@ -383,7 +383,7 @@ def test_usr_local_custom_collector_scans_executable_bin_and_notes_cap(
monkeypatch.setattr(paths.os, "walk", fake_walk)
monkeypatch.setattr(paths.os.path, "isfile", fake_isfile)
monkeypatch.setattr(paths.os.path, "islink", lambda p: False)
monkeypatch.setattr(paths.h, "stat_triplet", fake_stat_triplet)
monkeypatch.setattr(paths, "stat_triplet", fake_stat_triplet)
monkeypatch.setattr(paths, "capture_file", lambda *a, **kw: fake_capture_file(**kw))
ctx = _context(tmp_path)