colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tests: fix discrepancy between nix-build and nix build

Browse Source
This commit is contained in:
Jacob Moody 2023-12-23 22:40:56 -06:00
parent 04e1a2d69c
commit 4db920ed4f
6 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -464,7 +464,7 @@ in {
keymap = handleTest ./keymap.nix {}; keymap = handleTest ./keymap.nix {};
knot = handleTest ./knot.nix {}; knot = handleTest ./knot.nix {};
komga = handleTest ./komga.nix {}; komga = handleTest ./komga.nix {};
krb5 = discoverTests (import ./krb5 {}); krb5 = discoverTests (import ./krb5);
ksm = handleTest ./ksm.nix {}; ksm = handleTest ./ksm.nix {};
kthxbye = handleTest ./kthxbye.nix {}; kthxbye = handleTest ./kthxbye.nix {};
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};

2
nixos/tests/freetube.nix
View File

@ -40,4 +40,4 @@ let
''; '';
}); });
in in
builtins.mapAttrs (k: v: mkTest k v { }) tests builtins.mapAttrs (k: v: mkTest k v) tests

32
nixos/tests/keycloak.nix
View File

@ -6,8 +6,8 @@ let
certs = import ./common/acme/server/snakeoil-certs.nix; certs = import ./common/acme/server/snakeoil-certs.nix;
frontendUrl = "https://${certs.domain}"; frontendUrl = "https://${certs.domain}";
keycloakTest = import ./make-test-python.nix ( keycloakTest = databaseType: import ./make-test-python.nix (
{ pkgs, databaseType, ... }: { pkgs, ... }:
let let
initialAdminPassword = "h4Iho\"JFn't2>iQIR9"; initialAdminPassword = "h4Iho\"JFn't2>iQIR9";
adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}"; adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}";
@ -76,16 +76,18 @@ let
enabled = true; enabled = true;
realm = "test-realm"; realm = "test-realm";
clients = [ client ]; clients = [ client ];
users = [( users = [
user // { (
enabled = true; user // {
credentials = [{ enabled = true;
type = "password"; credentials = [{
temporary = false; type = "password";
value = password; temporary = false;
}]; value = password;
} }];
)]; }
)
];
}; };
realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm); realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm);
@ -177,7 +179,7 @@ let
); );
in in
{ {
postgres = keycloakTest { databaseType = "postgresql"; }; postgres = keycloakTest "postgresql";
mariadb = keycloakTest { databaseType = "mariadb"; }; mariadb = keycloakTest "mariadb";
mysql = keycloakTest { databaseType = "mysql"; }; mysql = keycloakTest "mysql";
} }

3
nixos/tests/krb5/default.nix
View File

@ -1,4 +1,3 @@
{ system ? builtins.currentSystem }:
{ {
example-config = import ./example-config.nix { inherit system; }; example-config = import ./example-config.nix;
} }

30
nixos/tests/opensearch.nix
View File

@ -1,7 +1,7 @@
let let
opensearchTest = opensearchTest = extraSettings:
import ./make-test-python.nix ( import ./make-test-python.nix (
{ pkgs, lib, extraSettings ? {} }: { { pkgs, lib, ... }: {
name = "opensearch"; name = "opensearch";
meta.maintainers = with pkgs.lib.maintainers; [ shyim ]; meta.maintainers = with pkgs.lib.maintainers; [ shyim ];
@ -27,20 +27,18 @@ in
{ {
opensearch = opensearchTest {}; opensearch = opensearchTest {};
opensearchCustomPathAndUser = opensearchTest { opensearchCustomPathAndUser = opensearchTest {
extraSettings = { services.opensearch.dataDir = "/var/opensearch_test";
services.opensearch.dataDir = "/var/opensearch_test"; services.opensearch.user = "open_search";
services.opensearch.user = "open_search"; services.opensearch.group = "open_search";
services.opensearch.group = "open_search"; systemd.tmpfiles.rules = [
systemd.tmpfiles.rules = [ "d /var/opensearch_test 0700 open_search open_search -"
"d /var/opensearch_test 0700 open_search open_search -" ];
]; users = {
users = { groups.open_search = { };
groups.open_search = {}; users.open_search = {
users.open_search = { description = "OpenSearch daemon user";
description = "OpenSearch daemon user"; group = "open_search";
group = "open_search"; isSystemUser = true;
isSystemUser = true;
};
}; };
}; };
}; };

2
nixos/tests/vscodium.nix
View File

@ -76,4 +76,4 @@ let
}); });
in in
builtins.mapAttrs (k: v: mkTest k v { }) tests builtins.mapAttrs (k: v: mkTest k v) tests