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

stages/test: kickstart different messages

Browse source 
On Python 3.6 we're getting a *different* error message from other
versions in CI. Let's accept both versions.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
This commit is contained in:
Simon de Vlieger 2025-06-16 13:14:39 +02:00 • committed by Brian C. Lane
parent 3bbacb5703
commit bc99513c0a
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
stages/test/test_kickstart.py
View file

@ -352,14 +352,14 @@ def test_kickstart_valid(tmp_path, stage_module, test_input, expected): # pylin
({"reboot": {"random": "option"}}, "{'random': 'option'} is not valid "), ({"reboot": {"random": "option"}}, "{'random': 'option'} is not valid "),
({"display_mode": "invalid-mode"}, "'invalid-mode' is not one of "), ({"display_mode": "invalid-mode"}, "'invalid-mode' is not one of "),
# autopart # autopart
({"autopart": {"type": "not-valid"}}, "'not-valid' is not one of ["), ({"autopart": {"type": "not-valid"}}, r"'not-valid' is not one of \["),
# Only one of --pbkdf-{time,iterations} can be specified at the same time # Only one of --pbkdf-{time,iterations} can be specified at the same time
({"autopart": {"pbkdf-time": 1, "pbkdf-iterations": 2}}, " should not be valid under "), ({"autopart": {"pbkdf-time": 1, "pbkdf-iterations": 2}}, r"( should not be valid under| is not allowed for)"),
# network is always a list # network is always a list
({"network": {"device": "foo"}}, " is not of type 'array'"), ({"network": {"device": "foo"}}, " is not of type 'array'"),
({"network": [{"device": "foo", "activate": "string"}]}, " is not of type 'boolean'"), ({"network": [{"device": "foo", "activate": "string"}]}, " is not of type 'boolean'"),
({"network": [{"device": "foo", "random": "option"}]}, "Additional properties are not allowed "), ({"network": [{"device": "foo", "random": "option"}]}, "Additional properties are not allowed "),
({"network": [{"device": "foo", "bootproto": "invalid"}]}, " is not one of ["), ({"network": [{"device": "foo", "bootproto": "invalid"}]}, r" is not one of \["),
({"network": [{"device": "foo", "ip": "invalid"}]}, " does not match "), ({"network": [{"device": "foo", "ip": "invalid"}]}, " does not match "),
({"network": [{"device": "foo", "ip": "256.1.1.1"}]}, " does not match "), ({"network": [{"device": "foo", "ip": "256.1.1.1"}]}, " does not match "),
({"network": [{"device": "foo", "ip": "1.256.1.1"}]}, " does not match "), ({"network": [{"device": "foo", "ip": "1.256.1.1"}]}, " does not match "),
@ -400,7 +400,7 @@ def test_kickstart_valid(tmp_path, stage_module, test_input, expected): # pylin
}]}, " does not match "), }]}, " does not match "),
# ostreecontainer # ostreecontainer
({"ostreecontainer": {"url": "http://some-ostree-url.com/foo", ({"ostreecontainer": {"url": "http://some-ostree-url.com/foo",
"transport": "not-valid"}}, "'not-valid' is not one of ["), "transport": "not-valid"}}, r"'not-valid' is not one of \["),
# not both ostreecontainer and ostree # not both ostreecontainer and ostree
( (
{ {
@ -446,4 +446,4 @@ def test_schema_validation_bad_apples(stage_schema, test_input, expected_err):
res = stage_schema.validate(test_data) res = stage_schema.validate(test_data)
assert res.valid is False assert res.valid is False
testutil.assert_jsonschema_error_contains(res, expected_err, expected_num_errs=1) testutil.assert_jsonschema_error_contains(res, re.compile(expected_err), expected_num_errs=1)