Skip to content

Commit a3c0b3b

Browse files
committed
Revert "nixos/tests/networking: test nameservers via DHCP"
This reverts commit bad5251. #348305 (comment) 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
1 parent ded3e59 commit a3c0b3b

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

nixos/tests/networking/networkd-and-scripted.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@ let
132132
client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q '192.168.2'")
133133
client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q 'fd00:1234:5678:2:'")
134134
135-
with subtest("Wait until we have received the nameservers"):
136-
client.wait_until_succeeds("grep -q 2001:db8::1 /etc/resolv.conf")
137-
client.wait_until_succeeds("grep -q 192.168.2.1 /etc/resolv.conf")
138-
139135
with subtest("Test vlan 1"):
140136
client.wait_until_succeeds("ping -c 1 192.168.1.1")
141137
client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1")

nixos/tests/networking/networkmanager.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ let
121121
static.wait_for_unit("NetworkManager.service")
122122
123123
dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '192.168.1.1'")
124-
dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '2001:db8::1'")
125124
static.wait_until_succeeds("cat /etc/resolv.conf | grep -q '10.10.10.10'")
126125
static.wait_until_fails("cat /etc/resolv.conf | grep -q '192.168.1.1'")
127126
'';

nixos/tests/networking/router.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
AdvSendAdvert on;
7373
AdvManagedFlag on;
7474
AdvOtherConfigFlag on;
75-
RDNSS 2001:db8::1 {};
7675
7776
prefix fd00:1234:5678:${toString n}::/64 {
7877
AdvAutonomous off;

0 commit comments

Comments
 (0)