diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-01 22:27:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-01 22:27:51 +0200 |
commit | b17b44232f5dd69f399c168c0c5ca87c58af0063 (patch) | |
tree | 82eced0bfc0a6db9c51aa9d7e399c4dc819aaa06 /nixos | |
parent | 6cd5863060a48b7d0331dd2f69a7cfd43417d4a3 (diff) | |
download | nixlib-b17b44232f5dd69f399c168c0c5ca87c58af0063.tar nixlib-b17b44232f5dd69f399c168c0c5ca87c58af0063.tar.gz nixlib-b17b44232f5dd69f399c168c0c5ca87c58af0063.tar.bz2 nixlib-b17b44232f5dd69f399c168c0c5ca87c58af0063.tar.lz nixlib-b17b44232f5dd69f399c168c0c5ca87c58af0063.tar.xz nixlib-b17b44232f5dd69f399c168c0c5ca87c58af0063.tar.zst nixlib-b17b44232f5dd69f399c168c0c5ca87c58af0063.zip |
nixos/tests/iftop: fix non-deterministic failure (#41309)
- make sure machines are fully booted before sending commands - test that capability setting in iftop module makes a difference
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/tests/iftop.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix index 21ff3cafed7c..a4f524ceb27b 100644 --- a/nixos/tests/iftop.nix +++ b/nixos/tests/iftop.nix @@ -9,22 +9,26 @@ with lib; nodes = { withIftop = { imports = [ ./common/user-account.nix ]; - programs.iftop.enable = true; }; withoutIftop = { imports = [ ./common/user-account.nix ]; + environment.systemPackages = [ pkgs.iftop ]; }; }; testScript = '' subtest "machine with iftop enabled", sub { - $withIftop->start; - $withIftop->succeed("su -l alice -c 'iftop -t -s 1'"); + $withIftop->waitForUnit("default.target"); + # limit to eth1 (eth0 is the test driver's control interface) + # and don't try name lookups + $withIftop->succeed("su -l alice -c 'iftop -t -s 1 -n -i eth1'"); }; subtest "machine without iftop", sub { - $withoutIftop->start; - $withoutIftop->mustFail("su -l alice -c 'iftop -t -s 1'"); + $withoutIftop->waitForUnit("default.target"); + # check that iftop is there but user alice lacks capabilities + $withoutIftop->succeed("iftop -t -s 1 -n -i eth1"); + $withoutIftop->fail("su -l alice -c 'iftop -t -s 1 -n -i eth1'"); }; ''; }) |