Unverified Commit b7a3aaae authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #259460 from K900/test-eval-fixes 

treewide: test eval fixes
parents c04c8ea6 320fcb40

nixos/lib/testing/nodes.nix

+9 −7
Original line number Diff line number Diff line
@@ -30,13 +30,15 @@ let 
            })

          ({ options, ... }: {

            key = "nodes.nix-pkgs";

            config = mkIf (!options.nixpkgs.pkgs.isDefined) {

            config = optionalAttrs (!config.node.pkgsReadOnly) (

              mkIf (!options.nixpkgs.pkgs.isDefined) {

                # Ensure we do not use aliases. Ideally this is only set

                # when the test framework is used by Nixpkgs NixOS tests.

                nixpkgs.config.allowAliases = false;

                # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates.

                nixpkgs.system = hostPkgs.stdenv.hostPlatform.system;

            };

              }

            );

          })

          testModuleArgs.config.extraBaseModules

        ];

nixos/modules/services/misc/gollum.nix

+1 −1
Original line number Diff line number Diff line
@@ -154,5 +154,5 @@ in 
    };

  };



  meta.maintainers = with lib.maintainers; [ erictapen bbenno joscha ];

  meta.maintainers = with lib.maintainers; [ erictapen bbenno ];

}

nixos/modules/services/network-filesystems/orangefs/server.nix

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ in { 
    # orangefs daemon will run as user

    users.users.orangefs = {

      isSystemUser = true;

      group = "orangfs";

      group = "orangefs";

    };

    users.groups.orangefs = {};

nixos/tests/all-tests.nix

+0 −1
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ in { 
  graylog = handleTest ./graylog.nix {};

  grocy = handleTest ./grocy.nix {};

  grub = handleTest ./grub.nix {};

  guacamole-client = handleTest ./guacamole-client.nix {};

  guacamole-server = handleTest ./guacamole-server.nix {};

  gvisor = handleTest ./gvisor.nix {};

  hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; };

nixos/tests/dconf.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ import ./make-test-python.nix 
        profiles.user.databases = [

          {

            settings = {

              "test/not/locked" = mkInt32 1;

              "test/is/locked" = "locked";

              "test/not".locked = mkInt32 1;

              "test/is".locked = "locked";

            };

            locks = [

              "/test/is/locked"