From 268bb4ea3c2d0c43518927b17bb4417bbdc4d8a1 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 25 Aug 2018 14:27:41 +0200
Subject: [PATCH] nixos/tests/munin: fix non-deterministic failure

- wait for node to listen before starting munin-cron
- increase timeout for munin-cron startup
- disable a failing plugin to remove irrelevant error message
---
 nixos/tests/munin.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index eb91d4d630bc..9f66005292ab 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -12,16 +12,23 @@ import ./make-test.nix ({ pkgs, ...} : {
       { config, ... }:
         {
           services = {
-           munin-node.enable = true;
-           munin-cron = {
+           munin-node = {
              enable = true;
-             hosts = ''
-               [${config.networking.hostName}]
-               address localhost
+             # disable a failing plugin to prevent irrelevant error message, see #23049
+             extraConfig = ''
+               ignore_file ^apc_nis$
              '';
            };
+           munin-cron = {
+            enable = true;
+            hosts = ''
+              [${config.networking.hostName}]
+              address localhost
+            '';
+           };
           };
-          systemd.services.munin-node.serviceConfig.TimeoutStartSec = "3min";
+          # long timeout to prevent hydra failure on high load
+          systemd.services.munin-node.serviceConfig.TimeoutStartSec = "10min";
         };
     };
 
@@ -29,7 +36,10 @@ import ./make-test.nix ({ pkgs, ...} : {
     startAll;
 
     $one->waitForUnit("munin-node.service");
+    # make sure the node is actually listening
+    $one->waitForOpenPort(4949);
     $one->succeed('systemctl start munin-cron');
+    # wait for munin-cron output
     $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd");
     $one->waitForFile("/var/www/munin/one/index.html");
   '';