diff options
author | Florian Klink <flokli@flokli.de> | 2019-12-07 23:03:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-07 23:03:15 +0100 |
commit | b665c387bca5aad9408e8b54f977f0bfe5e21a42 (patch) | |
tree | b3825d5098da64efd820fced7a8e3593bbfee85b /nixos | |
parent | c36b8c57c2b423ff034e373ee0ee01168a3ae43b (diff) | |
parent | 2cda20c12ee1cb80af476a1a1cdaeded7a0a51ef (diff) |
Merge pull request #74935 from x123/x123-munin-test-python
nixos/tests/munin: port to python
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/tests/munin.nix | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 31374aaf77e74..7b674db7768d9 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -1,7 +1,7 @@ # This test runs basic munin setup with node and cron job running on the same # machine. -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "munin"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ domenkozar eelco ]; @@ -12,33 +12,33 @@ import ./make-test.nix ({ pkgs, ...} : { { config, ... }: { services = { - munin-node = { + munin-node = { + enable = true; + # disable a failing plugin to prevent irrelevant error message, see #23049 + disabledPlugins = [ "apc_nis" ]; + }; + munin-cron = { enable = true; - # disable a failing plugin to prevent irrelevant error message, see #23049 - disabledPlugins = [ "apc_nis" ]; - }; - munin-cron = { - enable = true; - hosts = '' - [${config.networking.hostName}] - address localhost - ''; - }; + hosts = '' + [${config.networking.hostName}] + address localhost + ''; + }; }; - # long timeout to prevent hydra failure on high load - systemd.services.munin-node.serviceConfig.TimeoutStartSec = "10min"; + + # increase the systemd timer interval so it fires more often + systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.stdenv.lib.mkForce "*:*:0/10"; }; }; testScript = '' - startAll; + start_all() - $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"); + with subtest("ensure munin-node starts and listens on 4949"): + one.wait_for_unit("munin-node.service") + one.wait_for_open_port(4949) + with subtest("ensure munin-cron output is correct"): + one.wait_for_file("/var/lib/munin/one/one-uptime-uptime-g.rrd") + one.wait_for_file("/var/www/munin/one/index.html") ''; }) |