Unverified Commit 5c219b59 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

nixosTests: fix some eval errors and warnings (#401553)

parents 4b219d09 64478451

nixos/modules/system/activation/lib/test.nix→nixos/modules/system/activation/lib-test.nix

+1 −7
Original line number Diff line number Diff line
@@ -10,13 +10,7 @@ let 


  runTests = stdenv.mkDerivation {

    name = "tests-activation-lib";

    src = fileset.toSource {

      root = ./.;

      fileset = fileset.unions [

        ./lib.sh

        ./test.sh

      ];

    };

    src = ./lib;

    buildPhase = ":";

    doCheck = true;

    postUnpack = ''

nixos/modules/system/activation/test.nix

+8 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
}:

let

  node-forbiddenDependencies-fail = nixos (

    { ... }:

    { config, ... }:

    {

      system.forbiddenDependenciesRegexes = [ "-dev$" ];

      environment.etc."dev-dependency" = {
@@ -15,16 +15,22 @@ let 
      documentation.enable = false;

      fileSystems."/".device = "ignore-root-device";

      boot.loader.grub.enable = false;



      # Don't do this in an actual config

      system.stateVersion = config.system.nixos.release;

    }

  );

  node-forbiddenDependencies-succeed = nixos (

    { ... }:

    { config, ... }:

    {

      system.forbiddenDependenciesRegexes = [ "-dev$" ];

      system.extraDependencies = [ expect.dev ];

      documentation.enable = false;

      fileSystems."/".device = "ignore-root-device";

      boot.loader.grub.enable = false;



      # Don't do this in an actual config

      system.stateVersion = config.system.nixos.release;

    }

  );

in

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ in 
  activation-bashless-image = runTest ./activation/bashless-image.nix;

  activation-etc-overlay-immutable = runTest ./activation/etc-overlay-immutable.nix;

  activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix;

  activation-lib = pkgs.callPackage ../modules/system/activation/lib/test.nix { };

  activation-lib = pkgs.callPackage ../modules/system/activation/lib-test.nix { };

  activation-nix-channel = runTest ./activation/nix-channel.nix;

  activation-nixos-init = runTest ./activation/nixos-init.nix;

  activation-perlless = runTest ./activation/perlless.nix;

nixos/tests/kanidm-provisioning.nix

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ in 
  name = "kanidm-provisioning-${kanidmPackage.version}";

  meta.maintainers = with pkgs.lib.maintainers; [ oddlama ];



  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidmWithSecretProvisioning;

  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidmWithSecretProvisioning_1_7;



  nodes.provision =

    { pkgs, lib, ... }:

nixos/tests/kanidm.nix

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ in 
    oddlama

  ];



  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm;

  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm_1_7;



  nodes.server =

    { pkgs, ... }: