Unverified Commit a3c0b3b2 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Revert "nixos/tests/networking: test nameservers via DHCP" 

This reverts commit bad5251e.

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
parent ded3e593

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

+0 −4
Original line number Diff line number Diff line
@@ -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")

nixos/tests/networking/networkmanager.nix

+0 −1
Original line number Diff line number Diff line
@@ -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'")

      '';

nixos/tests/networking/router.nix

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ 
          AdvSendAdvert on;

          AdvManagedFlag on;

          AdvOtherConfigFlag on;

          RDNSS 2001:db8::1 {};



          prefix fd00:1234:5678:${toString n}::/64 {

            AdvAutonomous off;