Merge pull request #45622 from xeji/p/munin-test

nixos/tests/munin: fix non-deterministic failure
This commit is contained in:
Sarah Brofeldt 2018-08-25 15:47:22 +02:00 committed by GitHub
commit 6b709c538a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -12,16 +12,23 @@ import ./make-test.nix ({ pkgs, ...} : {
{ config, ... }: { config, ... }:
{ {
services = { services = {
munin-node.enable = true; munin-node = {
munin-cron = {
enable = true; enable = true;
hosts = '' # disable a failing plugin to prevent irrelevant error message, see #23049
[${config.networking.hostName}] extraConfig = ''
address localhost 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; startAll;
$one->waitForUnit("munin-node.service"); $one->waitForUnit("munin-node.service");
# make sure the node is actually listening
$one->waitForOpenPort(4949);
$one->succeed('systemctl start munin-cron'); $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/lib/munin/one/one-uptime-uptime-g.rrd");
$one->waitForFile("/var/www/munin/one/index.html"); $one->waitForFile("/var/www/munin/one/index.html");
''; '';