public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #35169: nixos/tests: fix ipv6 test failure

Browse Source
This commit is contained in:
Vladimír Čunát 2018-02-19 11:38:16 +01:00
commit 8b1cf100cd
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/ipv6.nix
View File

@ -47,7 +47,7 @@ import ./make-test.nix ({ pkgs, ...} : {
# Detection). # Detection).
sub waitForAddress { sub waitForAddress {
my ($machine, $iface, $scope) = @_; my ($machine, $iface, $scope) = @_;
$machine->waitUntilSucceeds("[ `ip -o -6 addr show dev $iface scope $scope | grep -v tentative | wc -l` -eq 1 ]"); $machine->waitUntilSucceeds("[ `ip -o -6 addr show dev $iface scope $scope | grep -v tentative | wc -l` -ge 1 ]");
my $ip = (split /[ \/]+/, $machine->succeed("ip -o -6 addr show dev $iface scope $scope"))[3]; my $ip = (split /[ \/]+/, $machine->succeed("ip -o -6 addr show dev $iface scope $scope"))[3];
$machine->log("$scope address on $iface is $ip"); $machine->log("$scope address on $iface is $ip");
return $ip; return $ip;