Fix: update tests and error message

This commit is contained in:
Johannes Kirschbauer
2024-10-07 23:04:30 +02:00
parent cc0aa3d2a2
commit 1237071081
2 changed files with 6 additions and 6 deletions

View File

@@ -103,7 +103,7 @@ let
if builtins.pathExists path then if builtins.pathExists path then
path path
else else
throw "Module doesn't have role: '${role}'. Path: ${path} not found." throw "Module doesn't have role: '${role}'. Role: ${role}.nix not found."
) machineRoles; ) machineRoles;
roleServiceConfigs = builtins.filter (m: m != { }) ( roleServiceConfigs = builtins.filter (m: m != { }) (

View File

@@ -42,13 +42,13 @@ in
expected = { expected = {
server_imports = [ server_imports = [
"${clan-core.clanModules.borgbackup}/roles/server.nix" (clan-core.clanModules.borgbackup + "/roles/server.nix")
]; ];
client_1_imports = [ client_1_imports = [
"${clan-core.clanModules.borgbackup}/roles/client.nix" (clan-core.clanModules.borgbackup + "/roles/client.nix")
]; ];
client_2_imports = [ client_2_imports = [
"${clan-core.clanModules.borgbackup}/roles/client.nix" (clan-core.clanModules.borgbackup + "/roles/client.nix")
]; ];
}; };
}; };
@@ -114,8 +114,8 @@ in
}; };
expected = { expected = {
machine_1_imports = [ machine_1_imports = [
"${clan-core.clanModules.borgbackup}/roles/client.nix" (clan-core.clanModules.borgbackup + "/roles/client.nix")
"${clan-core.clanModules.borgbackup}/roles/server.nix" (clan-core.clanModules.borgbackup + "/roles/server.nix")
]; ];
}; };
}; };