summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-11-01 20:13:38 +0100
committerVladimír Čunát <vcunat@gmail.com>2018-11-01 20:15:27 +0100
commitcc41aefe4485dea399930b8d173c26e438cb5e22 (patch)
treebbb5ffc596651261ed889ebac40b9f94267dfae8 /nixos/tests
parentc8e2b666a7d53173feaa728d85bbb868c2ea4aa2 (diff)
downloadnixlib-cc41aefe4485dea399930b8d173c26e438cb5e22.tar
nixlib-cc41aefe4485dea399930b8d173c26e438cb5e22.tar.gz
nixlib-cc41aefe4485dea399930b8d173c26e438cb5e22.tar.bz2
nixlib-cc41aefe4485dea399930b8d173c26e438cb5e22.tar.lz
nixlib-cc41aefe4485dea399930b8d173c26e438cb5e22.tar.xz
nixlib-cc41aefe4485dea399930b8d173c26e438cb5e22.tar.zst
nixlib-cc41aefe4485dea399930b8d173c26e438cb5e22.zip
chromium tests: inherit timeout from the package
/cc #49442.  It should decrease the waste of resources due to abortions.
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/chromium.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index c341e83961a8..fcc55a59a216 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -12,8 +12,10 @@ with pkgs.lib;
 
 mapAttrs (channel: chromiumPkg: makeTest rec {
   name = "chromium-${channel}";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ aszlig ];
+  meta = {
+    maintainers = with maintainers; [ aszlig ];
+    # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621
+    inherit (chromiumPkg.meta) timeout;
   };
 
   enableOCR = true;