Unverified Commit ca0de94e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #276816 from majiru/nixos-tests-build-discrepancy 

Nixos tests build discrepancy
parents 7acd2a02 112a71ee

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ in { 
  keymap = handleTest ./keymap.nix {};

  knot = handleTest ./knot.nix {};

  komga = handleTest ./komga.nix {};

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

  krb5 = discoverTests (import ./krb5);

  ksm = handleTest ./ksm.nix {};

  kthxbye = handleTest ./kthxbye.nix {};

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

nixos/tests/freetube.nix

+1 −1
Original line number Diff line number Diff line
@@ -40,4 +40,4 @@ let 
      '';

    });

in

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

nixos/tests/keycloak.nix

+17 −15
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ let 
  certs = import ./common/acme/server/snakeoil-certs.nix;

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



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

    { pkgs, databaseType, ... }:

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

    { pkgs, ... }:

    let

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

      adminPasswordFile = pkgs.writeText "admin-password" "${initialAdminPassword}";
@@ -76,7 +76,8 @@ let 
            enabled = true;

            realm = "test-realm";

            clients = [ client ];

            users = [(

            users = [

              (

                user // {

                  enabled = true;

                  credentials = [{
@@ -85,7 +86,8 @@ let 
                    value = password;

                  }];

                }

            )];

              )

            ];

          };



          realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm);
@@ -177,7 +179,7 @@ let 
  );

in

{

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

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

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

  postgres = keycloakTest "postgresql";

  mariadb = keycloakTest "mariadb";

  mysql = keycloakTest "mysql";

}

nixos/tests/krb5/default.nix

+1 −2
Original line number Diff line number Diff line 
{ system ? builtins.currentSystem }:

{

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

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

}

nixos/tests/make-test-python.nix

+1 −1
Original line number Diff line number Diff line 
f: {

  system ? builtins.currentSystem,

  system,

  pkgs ? import ../.. { inherit system; config = {}; overlays = []; },

  ...

} @ args: