From cdbc7fffca3b5e5453b8313d3433b9d45db74fa5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 27 Jun 2022 23:04:12 +0200 Subject: [PATCH] [mount] Repair test-config files against schema - can't use *bogus* as a key unless that's allowed by the schema -- and it is not. - can't supply empty config if there is supposed to be an object there. This makes it a little difficult to allow a config-file that is actually no-configuration-at-all (or only-defaults). Put in values for *btrfsSwapSubvol* since it isn't a fragile setting. --- src/modules/mount/tests/1.job | 2 +- src/modules/mount/tests/2.job | 1 + src/modules/mount/tests/3.job | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/mount/tests/1.job b/src/modules/mount/tests/1.job index 94b3a1492..5d2365cc6 100644 --- a/src/modules/mount/tests/1.job +++ b/src/modules/mount/tests/1.job @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: no # SPDX-License-Identifier: CC0-1.0 -bogus: true +btrfsSwapSubvol: "" # No configuration needed because the partitions are # all filesystems that require no special handling. diff --git a/src/modules/mount/tests/2.job b/src/modules/mount/tests/2.job index 40d8c6171..54ff59d4a 100644 --- a/src/modules/mount/tests/2.job +++ b/src/modules/mount/tests/2.job @@ -1,5 +1,6 @@ # SPDX-FileCopyrightText: no # SPDX-License-Identifier: CC0-1.0 +btrfsSwapSubvol: "" # Expect a complaint and a default btrfs layout because the # partitions use btrfs diff --git a/src/modules/mount/tests/3.job b/src/modules/mount/tests/3.job index 94b3a1492..5d2365cc6 100644 --- a/src/modules/mount/tests/3.job +++ b/src/modules/mount/tests/3.job @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: no # SPDX-License-Identifier: CC0-1.0 -bogus: true +btrfsSwapSubvol: "" # No configuration needed because the partitions are # all filesystems that require no special handling.