diff options
author | Uli Baum <xeji@cat3.de> | 2018-08-25 14:27:41 +0200 |
---|---|---|
committer | Uli Baum <xeji@cat3.de> | 2018-08-25 14:27:41 +0200 |
commit | 268bb4ea3c2d0c43518927b17bb4417bbdc4d8a1 (patch) | |
tree | 6fdfb7b9daeb3272363623e2ebf4d3f6ffc0b48d | |
parent | 2c1e736ae8ea308cecc6b6f2cf44638280393363 (diff) | |
download | nixpkgs-268bb4ea3c2d0c43518927b17bb4417bbdc4d8a1.tar nixpkgs-268bb4ea3c2d0c43518927b17bb4417bbdc4d8a1.tar.gz nixpkgs-268bb4ea3c2d0c43518927b17bb4417bbdc4d8a1.tar.bz2 nixpkgs-268bb4ea3c2d0c43518927b17bb4417bbdc4d8a1.tar.lz nixpkgs-268bb4ea3c2d0c43518927b17bb4417bbdc4d8a1.tar.xz nixpkgs-268bb4ea3c2d0c43518927b17bb4417bbdc4d8a1.tar.zst nixpkgs-268bb4ea3c2d0c43518927b17bb4417bbdc4d8a1.zip |
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
-rw-r--r-- | nixos/tests/munin.nix | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index eb91d4d630b..9f66005292a 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"); ''; |