From b3884c8b7d7f6e7bb3efb2199894b6cbdcea43c7 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 29 Jan 2025 11:50:16 +0100 Subject: [PATCH] lib/modules: tests change expected error for class mismatch --- lib/tests/modules.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index beb191aed0c1..c86e0aeec6dc 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -538,12 +538,12 @@ checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-i # Class checks, evalModules checkConfigOutput '^{}$' config.ok.config ./class-check.nix checkConfigOutput '"nixos"' config.ok.class ./class-check.nix -checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.fail.config ./class-check.nix -checkConfigError 'The module foo.nix#darwinModules.default was imported into nixos instead of darwin.' config.fail-anon.config ./class-check.nix +checkConfigError 'The module `.*/module-class-is-darwin.nix`.*?expects class "nixos".' config.fail.config ./class-check.nix +checkConfigError 'The module `foo.nix#darwinModules.default`.*?expects class "nixos".' config.fail-anon.config ./class-check.nix # Class checks, submoduleWith checkConfigOutput '^{}$' config.sub.nixosOk ./class-check.nix -checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.sub.nixosFail.config ./class-check.nix +checkConfigError 'The module `.*/module-class-is-darwin.nix`.*?expects class "nixos".' config.sub.nixosFail.config ./class-check.nix # submoduleWith type merge with different class checkConfigError 'A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix