diff --git a/stages/test/conftest.py b/stages/test/conftest.py index d9a314e4..f2f9d5a7 100644 --- a/stages/test/conftest.py +++ b/stages/test/conftest.py @@ -43,39 +43,3 @@ def stage_schema(request: pytest.FixtureRequest) -> osbuild.meta.Schema: root = caller_dir.parent.parent mod_info = osbuild.meta.ModuleInfo.load(root, "Stage", stage_name) return osbuild.meta.Schema(mod_info.get_schema(version=schema_version), stage_name) - - -@pytest.fixture -def bootc_devices_mounts_dict() -> dict: - """ bootc_devices_mounts_dict returns a dict with a typical bootc - devices/mount dict - """ - return { - "devices": { - "disk": { - "type": "org.osbuild.loopback", - "options": { - "filename": "disk.raw", - "partscan": True, - } - } - }, - "mounts": [ - { - "name": "root", - "type": "org.osbuild.ext4", - "source": "disk", - "partition": 4, - "target": "/" - }, { - "name": "ostree.deployment", - "type": "org.osbuild.ostree.deployment", - "options": { - "source": "mount", - "deployment": { - "default": True, - } - } - } - ] - } diff --git a/stages/test/test_groups.py b/stages/test/test_groups.py index 2d5f7081..a3940a3f 100644 --- a/stages/test/test_groups.py +++ b/stages/test/test_groups.py @@ -29,10 +29,3 @@ def test_schema_validation(stage_schema, test_data, expected_err): else: assert res.valid is False assert_jsonschema_error_contains(res, expected_err, expected_num_errs=1) - - -def test_schema_supports_bootc_style_mounts(stage_schema, bootc_devices_mounts_dict): - test_input = bootc_devices_mounts_dict - test_input["type"] = STAGE_NAME - res = stage_schema.validate(test_input) - assert res.valid is True, f"err: {[e.as_dict() for e in res.errors]}" diff --git a/stages/test/test_selinux.py b/stages/test/test_selinux.py index dca271b6..af1e1b56 100644 --- a/stages/test/test_selinux.py +++ b/stages/test/test_selinux.py @@ -48,13 +48,6 @@ def test_schema_validation_selinux_file_context_required(stage_schema): testutil.assert_jsonschema_error_contains(res, expected_err, expected_num_errs=1) -def test_schema_supports_bootc_style_mounts(stage_schema, bootc_devices_mounts_dict): - test_input = bootc_devices_mounts_dict - test_input["type"] = STAGE_NAME - res = stage_schema.validate(test_input) - assert res.valid is True, f"err: {[e.as_dict() for e in res.errors]}" - - @patch("osbuild.util.selinux.setfiles") def test_selinux_file_contexts(mocked_setfiles, tmp_path, stage_module): options = { diff --git a/stages/test/test_users.py b/stages/test/test_users.py index 392449fb..c74cbe55 100644 --- a/stages/test/test_users.py +++ b/stages/test/test_users.py @@ -36,13 +36,6 @@ def test_schema_validation(stage_schema, test_data, expected_err): assert_jsonschema_error_contains(res, expected_err, expected_num_errs=1) -def test_schema_supports_bootc_style_mounts(stage_schema, bootc_devices_mounts_dict): - test_input = bootc_devices_mounts_dict - test_input["type"] = STAGE_NAME - res = stage_schema.validate(test_input) - assert res.valid is True, f"err: {[e.as_dict() for e in res.errors]}" - - TEST_CASES = [ # user_opts,expected commandline args ({}, []),