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

Merge pull request #216658 from K900/sensible-test-timeouts 

nixos/tests: sensible test timeouts
parents 9d344df5 254426ec

nixos/lib/testing/meta.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ in 
          };

          timeout = lib.mkOption {

            type = types.nullOr types.int;

            default = null; # NOTE: null values are filtered out by `meta`.

            default = 3600;  # 1 hour

            description = mdDoc ''

              The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds.

            '';

nixos/tests/pass-secret-service.nix

+1 −1
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ pkgs, lib, ... }: {

  name = "pass-secret-service";

  meta.maintainers = with lib; [ aidalgol ];

  meta.maintainers = [ lib.maintainers.aidalgol ];



  nodes.machine = { nodes, pkgs, ... }:

    {

nixos/tests/quake3.nix

+4 −4
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ pkgs, ...} :

import ./make-test-python.nix ({ pkgs, lib, ...} :



let
@@ -11,9 +11,9 @@ let 
    };



  # Only allow the demo data to be used (only if it's unfreeRedistributable).

  unfreePredicate = pkg: with pkgs.lib; let

  unfreePredicate = pkg: with lib; let

    allowPackageNames = [ "quake3-demodata" "quake3-pointrelease" ];

    allowLicenses = [ pkgs.lib.licenses.unfreeRedistributable ];

    allowLicenses = [ lib.licenses.unfreeRedistributable ];

  in elem pkg.pname allowPackageNames &&

     elem (pkg.meta.license or null) allowLicenses;
@@ -31,7 +31,7 @@ in 


rec {

  name = "quake3";

  meta = with pkgs.stdenv.lib.maintainers; {

  meta = with lib.maintainers; {

    maintainers = [ domenkozar eelco ];

  };