From a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 14 Oct 2024 08:47:11 +0200 Subject: [PATCH] Revert "nixos/tests/networking: test nameservers via DHCP" This reverts commit bad5251e874bec27438cb8a613ec87e845ed437e. https://github.com/NixOS/nixpkgs/pull/348305#issuecomment-2410165312 Should've known that commit starting with `bad` will be no good. Fixes nixosTests.networking.networkd.dhcpSimple https://hydra.nixos.org/build/274843085/nixlog/8/tail --- nixos/tests/networking/networkd-and-scripted.nix | 4 ---- nixos/tests/networking/networkmanager.nix | 1 - nixos/tests/networking/router.nix | 1 - 3 files changed, 6 deletions(-) diff --git a/nixos/tests/networking/networkd-and-scripted.nix b/nixos/tests/networking/networkd-and-scripted.nix index 6b8ed50a2f19e..777c00f74e228 100644 --- a/nixos/tests/networking/networkd-and-scripted.nix +++ b/nixos/tests/networking/networkd-and-scripted.nix @@ -132,10 +132,6 @@ let client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q '192.168.2'") client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q 'fd00:1234:5678:2:'") - with subtest("Wait until we have received the nameservers"): - client.wait_until_succeeds("grep -q 2001:db8::1 /etc/resolv.conf") - client.wait_until_succeeds("grep -q 192.168.2.1 /etc/resolv.conf") - with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1") diff --git a/nixos/tests/networking/networkmanager.nix b/nixos/tests/networking/networkmanager.nix index 70d28fe96380b..bd989408df8a1 100644 --- a/nixos/tests/networking/networkmanager.nix +++ b/nixos/tests/networking/networkmanager.nix @@ -121,7 +121,6 @@ let static.wait_for_unit("NetworkManager.service") dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '192.168.1.1'") - dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '2001:db8::1'") static.wait_until_succeeds("cat /etc/resolv.conf | grep -q '10.10.10.10'") static.wait_until_fails("cat /etc/resolv.conf | grep -q '192.168.1.1'") ''; diff --git a/nixos/tests/networking/router.nix b/nixos/tests/networking/router.nix index fab21c9e78624..e0ad7fa01591a 100644 --- a/nixos/tests/networking/router.nix +++ b/nixos/tests/networking/router.nix @@ -72,7 +72,6 @@ AdvSendAdvert on; AdvManagedFlag on; AdvOtherConfigFlag on; - RDNSS 2001:db8::1 {}; prefix fd00:1234:5678:${toString n}::/64 { AdvAutonomous off;