particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stages(bootupd): refactor test to separately test behaviors

Browse source 
It now tests  bind_mounts and bootupd behavior separately.
This commit is contained in:
Michael Vogt 2024-01-09 12:05:13 +01:00 • committed by Achilleas Koutsou
parent dacf5733ea
commit 492dc6021c
2 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
stages/org.osbuild.bootupd
View file

@ -76,7 +76,7 @@ def bind_mounts(sources, dest_root):
try: try:
yield yield
finally: finally:
for src in sources: for src in reversed(sources):
dst = os.path.join(dest_root, src.lstrip("/")) dst = os.path.join(dest_root, src.lstrip("/"))
subprocess.run(["umount", "--recursive", dst], check=False) subprocess.run(["umount", "--recursive", dst], check=False)

47
stages/test/test_bootupd.py
View file

@ -59,8 +59,13 @@ def test_bootupd_schema_validation(test_data, expected_err):
assert expected_err in err_msgs[0] assert expected_err in err_msgs[0]
@pytest.mark.parametrize("test_options,expected_bootupd_opts", [
({}, []),
({"bios": {"device": "/dev/sda"}}, ["--device=/mapped/dev/sda"]),
({"static-configs": True}, ["--with-static-configs"]),
])
@patch("subprocess.run") @patch("subprocess.run")
def test_bootupd_defaults(mocked_run): def test_bootupd_defaults(mocked_run, test_options, expected_bootupd_opts):
stage_path = os.path.join(os.path.dirname(__file__), "../org.osbuild.bootupd") stage_path = os.path.join(os.path.dirname(__file__), "../org.osbuild.bootupd")
stage = import_module_from_path("bootupd_stage", stage_path) stage = import_module_from_path("bootupd_stage", stage_path)
@ -68,10 +73,34 @@ def test_bootupd_defaults(mocked_run):
"paths": { "paths": {
"mounts": "/run/osbuild/mounts", "mounts": "/run/osbuild/mounts",
}, },
"devices": {
"/dev/sda": {
"path": "/mapped/dev/sda",
},
},
} }
options = {} options = test_options
stage.main(args, options) with patch.object(stage, "bind_mounts") as mocked_bind_mounts:
stage.main(args, options)
assert len(mocked_bind_mounts.call_args_list) == 1
assert mocked_run.call_args_list == [call(["chroot",
"/run/osbuild/mounts",
"/usr/bin/bootupctl",
"backend",
"install"] + expected_bootupd_opts + ["/run/osbuild/mounts"],
check=True),
]
@patch("subprocess.run")
def test_bootupd_bind_mounts(mocked_run):
stage_path = os.path.join(os.path.dirname(__file__), "../org.osbuild.bootupd")
stage = import_module_from_path("bootupd_stage", stage_path)
dst = "/run/osbuild/mounts/"
with stage.bind_mounts(['/dev', '/proc', '/sys', '/run', '/var', '/tmp'], dst):
pass
assert mocked_run.call_args_list == [ assert mocked_run.call_args_list == [
call(["mount", "--rbind", "/dev", "/run/osbuild/mounts/dev"], check=True), call(["mount", "--rbind", "/dev", "/run/osbuild/mounts/dev"], check=True),
call(["mount", "--rbind", "/proc", "/run/osbuild/mounts/proc"], check=True), call(["mount", "--rbind", "/proc", "/run/osbuild/mounts/proc"], check=True),
@ -79,11 +108,11 @@ def test_bootupd_defaults(mocked_run):
call(["mount", "--rbind", "/run", "/run/osbuild/mounts/run"], check=True), call(["mount", "--rbind", "/run", "/run/osbuild/mounts/run"], check=True),
call(["mount", "--rbind", "/var", "/run/osbuild/mounts/var"], check=True), call(["mount", "--rbind", "/var", "/run/osbuild/mounts/var"], check=True),
call(["mount", "--rbind", "/tmp", "/run/osbuild/mounts/tmp"], check=True), call(["mount", "--rbind", "/tmp", "/run/osbuild/mounts/tmp"], check=True),
call(["chroot", "/run/osbuild/mounts", "/usr/bin/bootupctl", "backend", "install", "/run/osbuild/mounts"], check=True), # and umount in reverse order
call(["umount", "--recursive", "/run/osbuild/mounts/dev"], check=False),
call(["umount", "--recursive", "/run/osbuild/mounts/proc"], check=False),
call(["umount", "--recursive", "/run/osbuild/mounts/sys"], check=False),
call(["umount", "--recursive", "/run/osbuild/mounts/run"], check=False),
call(["umount", "--recursive", "/run/osbuild/mounts/var"], check=False),
call(["umount", "--recursive", "/run/osbuild/mounts/tmp"], check=False), call(["umount", "--recursive", "/run/osbuild/mounts/tmp"], check=False),
call(["umount", "--recursive", "/run/osbuild/mounts/var"], check=False),
call(["umount", "--recursive", "/run/osbuild/mounts/run"], check=False),
call(["umount", "--recursive", "/run/osbuild/mounts/sys"], check=False),
call(["umount", "--recursive", "/run/osbuild/mounts/proc"], check=False),
call(["umount", "--recursive", "/run/osbuild/mounts/dev"], check=False),
] ]