b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixosTests.ipv6: fix waiting for address

Browse source 
wait_for_address sometimes returned tentative address.
This commit is contained in:
Martin Milata 2019-12-08 19:47:15 +01:00
parent ead22d1415
commit 6ebf84a3d6
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nixos/tests/ipv6.nix
View file

@ -49,12 +49,16 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
# Wait until the given interface has a non-tentative address of
# the desired scope (i.e. has completed Duplicate Address
# Detection).
def wait_for_address(machine, iface, scope):
machine.wait_until_succeeds(
f"[ `ip -o -6 addr show dev {iface} scope {scope} | grep -v tentative | wc -l` -ge 1 ]"
)
output = machine.succeed(f"ip -o -6 addr show dev {iface} scope {scope}")
def wait_for_address(machine, iface, scope, temporary=False):
temporary_flag = "temporary" if temporary else "-temporary"
cmd = f"ip -o -6 addr show dev {iface} scope {scope} -tentative {temporary_flag}"
machine.wait_until_succeeds(f"[ `{cmd} | wc -l` -eq 1 ]")
output = machine.succeed(cmd)
ip = re.search(r"inet6 ([0-9a-f:]{2,})/", output).group(1)
if temporary:
scope = scope + " temporary"
machine.log(f"{scope} address on {iface} is {ip}")
return ip
@ -78,7 +82,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
client.fail(f"curl --fail -g http://[{client_ip}]")
with subtest("Privacy extensions: Global temporary address can be obtained and pinged"):
ip = wait_for_address(client, "eth1", "global temporary")
ip = wait_for_address(client, "eth1", "global", temporary=True)
# Default route should have "src <temporary address>" in it
client.succeed(f"ip r g ::2 | grep {ip}")