Skip to content

Commit b3884c8

Browse files
committed
lib/modules: tests change expected error for class mismatch
1 parent 5c35166 commit b3884c8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/tests/modules.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,12 +538,12 @@ checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-i
538538
# Class checks, evalModules
539539
checkConfigOutput '^{}$' config.ok.config ./class-check.nix
540540
checkConfigOutput '"nixos"' config.ok.class ./class-check.nix
541-
checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.fail.config ./class-check.nix
542-
checkConfigError 'The module foo.nix#darwinModules.default was imported into nixos instead of darwin.' config.fail-anon.config ./class-check.nix
541+
checkConfigError 'The module `.*/module-class-is-darwin.nix`.*?expects class "nixos".' config.fail.config ./class-check.nix
542+
checkConfigError 'The module `foo.nix#darwinModules.default`.*?expects class "nixos".' config.fail-anon.config ./class-check.nix
543543

544544
# Class checks, submoduleWith
545545
checkConfigOutput '^{}$' config.sub.nixosOk ./class-check.nix
546-
checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.sub.nixosFail.config ./class-check.nix
546+
checkConfigError 'The module `.*/module-class-is-darwin.nix`.*?expects class "nixos".' config.sub.nixosFail.config ./class-check.nix
547547

548548
# submoduleWith type merge with different class
549549
checkConfigError 'A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix

0 commit comments

Comments
 (0)