commit 4db920ed4f73987d25abb9f0ee29480db99ca7f2 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       464
       464
        
         keymap = handleTest ./keymap.nix {};

     

       465
       465
        
         knot = handleTest ./knot.nix {};

     

       466
       466
        
         komga = handleTest ./komga.nix {};

     

       467
       467
       -
         krb5 = discoverTests (import ./krb5 {});

     

       467
       467
       +
         krb5 = discoverTests (import ./krb5);

     

       468
       468
        
         ksm = handleTest ./ksm.nix {};

     

       469
       469
        
         kthxbye = handleTest ./kthxbye.nix {};

     

       470
       470
        
         kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};

+1 -1

nixos/tests/freetube.nix

···

       40
       40
        
             '';

     

       41
       41
        
           });

     

       42
       42
        
       in

     

       43
       43
       -
       builtins.mapAttrs (k: v: mkTest k v { }) tests

     

       43
       43
       +
       builtins.mapAttrs (k: v: mkTest k v) tests

+17 -15

nixos/tests/keycloak.nix

···

       6
       6
        
         certs = import ./common/acme/server/snakeoil-certs.nix;

     

       7
       7
        
         frontendUrl = "https://${certs.domain}";

     

       8
       8
        
       

     

       9
       9
       -
         keycloakTest = import ./make-test-python.nix (

     

       10
       10
       -
           { pkgs, databaseType, ... }:

     

       9
       9
       +
         keycloakTest = databaseType: import ./make-test-python.nix (

     

       10
       10
       +
           { pkgs, ... }:

     

       11
       11
        
           let

     

       12
       12
        
             initialAdminPassword = "h4Iho\"JFn't2>iQIR9";

     

       13
       13
        
             adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}";

     
···

       76
       76
        
                   enabled = true;

     

       77
       77
        
                   realm = "test-realm";

     

       78
       78
        
                   clients = [ client ];

     

       79
       79
       -
                   users = [(

     

       80
       80
       -
                     user // {

     

       81
       81
       -
                       enabled = true;

     

       82
       82
       -
                       credentials = [{

     

       83
       83
       -
                         type = "password";

     

       84
       84
       -
                         temporary = false;

     

       85
       85
       -
                         value = password;

     

       86
       86
       -
                       }];

     

       87
       87
       -
                     }

     

       88
       88
       -
                   )];

     

       79
       79
       +
                   users = [

     

       80
       80
       +
                     (

     

       81
       81
       +
                       user // {

     

       82
       82
       +
                         enabled = true;

     

       83
       83
       +
                         credentials = [{

     

       84
       84
       +
                           type = "password";

     

       85
       85
       +
                           temporary = false;

     

       86
       86
       +
                           value = password;

     

       87
       87
       +
                         }];

     

       88
       88
       +
                       }

     

       89
       89
       +
                     )

     

       90
       90
       +
                   ];

     

       89
       91
        
                 };

     

       90
       92
        
       

     

       91
       93
        
                 realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm);

     
···

       177
       179
        
         );

     

       178
       180
        
       in

     

       179
       181
        
       {

     

       180
       180
       -
         postgres = keycloakTest { databaseType = "postgresql"; };

     

       181
       181
       -
         mariadb = keycloakTest { databaseType = "mariadb"; };

     

       182
       182
       -
         mysql = keycloakTest { databaseType = "mysql"; };

     

       182
       182
       +
         postgres = keycloakTest "postgresql";

     

       183
       183
       +
         mariadb = keycloakTest "mariadb";

     

       184
       184
       +
         mysql = keycloakTest "mysql";

     

       183
       185
        
       }

+1 -2

nixos/tests/krb5/default.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       2
       1
        
       {

     

       3
       3
       -
         example-config = import ./example-config.nix { inherit system; };

     

       2
       2
       +
         example-config = import ./example-config.nix;

     

       4
       3
        
       }

+14 -16

nixos/tests/opensearch.nix

···

       1
       1
        
       let

     

       2
       2
       -
         opensearchTest =

     

       2
       2
       +
         opensearchTest = extraSettings:

     

       3
       3
        
           import ./make-test-python.nix (

     

       4
       4
       -
             { pkgs, lib, extraSettings ? {} }: {

     

       4
       4
       +
             { pkgs, lib, ... }: {

     

       5
       5
        
               name = "opensearch";

     

       6
       6
        
               meta.maintainers = with pkgs.lib.maintainers; [ shyim ];

     

       7
       7
        
       

     
···

       27
       27
        
       {

     

       28
       28
        
         opensearch = opensearchTest {};

     

       29
       29
        
         opensearchCustomPathAndUser = opensearchTest {

     

       30
       30
       -
           extraSettings = {

     

       31
       31
       -
             services.opensearch.dataDir = "/var/opensearch_test";

     

       32
       32
       -
             services.opensearch.user = "open_search";

     

       33
       33
       -
             services.opensearch.group = "open_search";

     

       34
       34
       -
             systemd.tmpfiles.rules = [

     

       35
       35
       -
               "d /var/opensearch_test 0700 open_search open_search -"

     

       36
       36
       -
             ];

     

       37
       37
       -
             users = {

     

       38
       38
       -
               groups.open_search = {};

     

       39
       39
       -
               users.open_search = {

     

       40
       40
       -
                 description = "OpenSearch daemon user";

     

       41
       41
       -
                 group = "open_search";

     

       42
       42
       -
                 isSystemUser = true;

     

       43
       43
       -
               };

     

       30
       30
       +
           services.opensearch.dataDir = "/var/opensearch_test";

     

       31
       31
       +
           services.opensearch.user = "open_search";

     

       32
       32
       +
           services.opensearch.group = "open_search";

     

       33
       33
       +
           systemd.tmpfiles.rules = [

     

       34
       34
       +
             "d /var/opensearch_test 0700 open_search open_search -"

     

       35
       35
       +
           ];

     

       36
       36
       +
           users = {

     

       37
       37
       +
             groups.open_search = { };

     

       38
       38
       +
             users.open_search = {

     

       39
       39
       +
               description = "OpenSearch daemon user";

     

       40
       40
       +
               group = "open_search";

     

       41
       41
       +
               isSystemUser = true;

     

       44
       42
        
             };

     

       45
       43
        
           };

     

       46
       44
        
         };

+1 -1

nixos/tests/vscodium.nix

···

       76
       76
        
           });

     

       77
       77
        
       

     

       78
       78
        
       in

     

       79
       79
       -
       builtins.mapAttrs (k: v: mkTest k v { }) tests

     

       79
       79
       +
       builtins.mapAttrs (k: v: mkTest k v) tests