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

stages: Where is mandatory in systemd.unit.create

Browse source 
`systemd.mount(5)` describes both `What` and `Where` as mandatory
options for the `Mount` section of a unit.
This commit is contained in:
Achilleas Koutsou 2025-02-04 14:54:10 +01:00 • committed by Simon de Vlieger
parent 33fd0bd183
commit 45c6006cfc
2 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
stages/org.osbuild.systemd.unit.create.meta.json
View file

@ -265,7 +265,8 @@
"type": "object",
"description": "'Mount' configuration section of a unit file.",
"required": [
"What"
"What",
"Where"
],
"properties": {
"What": {

36
stages/test/test_systemd_unit_create.py
View file

@ -29,7 +29,7 @@ STAGE_NAME = "org.osbuild.systemd.unit.create"
"filename": "foo.mount",
"config": {
"Unit": {},
"Mount": {"What": ""},
"Mount": {"What": "", "Where": ""},
"Install": {},
},
},
@ -39,24 +39,44 @@ STAGE_NAME = "org.osbuild.systemd.unit.create"
{
"filename": "foo.mount",
"config": {
"Mount": {"What": ""},
"Mount": {"What": "", "Where": ""},
},
},
"",
),
# bad
# # No filename
({"config": {"Unit": {}, "Service": {}, "Install": {}}}, "'filename' is a required property"),
# # no config block
({"filename": "foo.service"}, "'config' is a required property"),
# # no Unit section in .service
({"filename": "foo.service", "config": {"Service": {}, "Install": {}}},
"{'Service': {}, 'Install': {}} is not valid under any of the given schemas"),
# # no Service section in .service
({"filename": "foo.service", "config": {"Unit": {}, "Install": {}}},
"{'Unit': {}, 'Install': {}} is not valid under any of the given schemas"),
# # no Install section in .service
({"filename": "foo.service", "config": {"Unit": {}, "Service": {}}},
"{'Unit': {}, 'Service': {}} is not valid under any of the given schemas"),
({"filename": "foo.service", "config": {"Service": {}, "Mount": {"What": ""}}},
"{'Service': {}, 'Mount': {'What': ''}} is not valid under any of the given schemas"),
({"filename": "foo.service", "config": {"Unit": {}, "Service": {}, "Mount": {"What": ""}, "Install": {}}},
"{'Unit': {}, 'Service': {}, 'Mount': {'What': ''}, 'Install': {}} is not valid under any of the given schemas"),
# # .mount unit without Where
({"filename": "foo.mount", "config": {"Unit": {}, "Mount": {"What": ""}, "Install": {}}},
"'Where' is a required property"),
# # .mount unit without What
({"filename": "foo.mount", "config": {"Unit": {}, "Mount": {"Where": ""}, "Install": {}}},
"'What' is a required property"),
# # .service unit with Mount section
({"filename": "foo.service", "config": {"Unit": {}, "Service": {},
"Mount": {"What": "", "Where": ""}, "Install": {}}},
"{'Unit': {}, 'Service': {}, 'Mount': {'What': '', 'Where': ''}, "
"'Install': {}} is not valid under any of the given schemas"),
])
@pytest.mark.parametrize("stage_schema", ["1"], indirect=True)
def test_schema_validation(stage_schema, test_data, expected_err):
@ -90,7 +110,7 @@ def test_schema_validation(stage_schema, test_data, expected_err):
"filename": "foo.mount",
"config": {
"Unit": {},
"Mount": {"What": ""},
"Mount": {"What": "", "Where": ""},
"Install": {},
},
},
@ -100,7 +120,7 @@ def test_schema_validation(stage_schema, test_data, expected_err):
{
"filename": "foo.mount",
"config": {
"Mount": {"What": ""},
"Mount": {"What": "", "Where": ""},
},
},
"",