Skip to content

Commit

Permalink
Revert "nixos/tests/networking: test nameservers via DHCP"
Browse files Browse the repository at this point in the history
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
  • Loading branch information
vcunat committed Oct 14, 2024
1 parent ded3e59 commit a3c0b3b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 6 deletions.
4 changes: 0 additions & 4 deletions nixos/tests/networking/networkd-and-scripted.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion nixos/tests/networking/networkmanager.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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'")
'';
Expand Down
1 change: 0 additions & 1 deletion nixos/tests/networking/router.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
AdvSendAdvert on;
AdvManagedFlag on;
AdvOtherConfigFlag on;
RDNSS 2001:db8::1 {};
prefix fd00:1234:5678:${toString n}::/64 {
AdvAutonomous off;
Expand Down

0 comments on commit a3c0b3b

Please sign in to comment.