diff options
| author | Dan Streetman <ddstreet@canonical.com> | 2020-04-16 00:30:33 +0200 |
|---|---|---|
| committer | Dan Streetman <ddstreet@canonical.com> | 2020-04-21 23:21:37 +0200 |
| commit | 06c2b0c76bf7e2756f8e9ef18765c85dee99ae14 (patch) | |
| tree | 4076608fd11fbd371a9bae8483a25a708ff14c9a /test/test-network/systemd-networkd-tests.py | |
| parent | network: honor SetDNSRoutes= even if UseGateway=False (diff) | |
| download | systemd-06c2b0c76bf7e2756f8e9ef18765c85dee99ae14.tar.xz systemd-06c2b0c76bf7e2756f8e9ef18765c85dee99ae14.zip | |
test: verify RoutesToDNS= is independent of UseGateway=
Diffstat (limited to '')
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index efc3b2ad09..3fc93a725f 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -3026,19 +3026,21 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): self.assertRegex(output, r'192.168.5.8 proto dhcp scope link src 192.168.5.181 metric 1024') def test_dhcp_client_ipv4_use_routes_gateway(self): - for (routes, gateway) in itertools.product([True, False, None], repeat=2): + for (routes, gateway, dnsroutes) in itertools.product([True, False, None], repeat=3): self.setUp() - with self.subTest(routes=routes, gateway=gateway): - self._test_dhcp_client_ipv4_use_routes_gateway(routes, gateway) + with self.subTest(routes=routes, gateway=gateway, dnsroutes=dnsroutes): + self._test_dhcp_client_ipv4_use_routes_gateway(routes, gateway, dnsroutes) self.tearDown() - def _test_dhcp_client_ipv4_use_routes_gateway(self, routes, gateway): + def _test_dhcp_client_ipv4_use_routes_gateway(self, routes, gateway, dnsroutes): testunit = 'dhcp-client-ipv4-use-routes-use-gateway.network' testunits = ['25-veth.netdev', 'dhcp-server-veth-peer.network', testunit] if routes != None: testunits.append(f'{testunit}.d/use-routes-{routes}.conf'); if gateway != None: testunits.append(f'{testunit}.d/use-gateway-{gateway}.conf'); + if dnsroutes != None: + testunits.append(f'{testunit}.d/use-dns-routes-{dnsroutes}.conf'); copy_unit_to_networkd_unit_path(*testunits, dropins=False) start_networkd() @@ -3066,8 +3068,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): else: self.assertNotRegex(output, r'default via 192.168.5.1') - # check for routes to DNS server, only if using gateway - if usegateway: + # Check RoutesToDNS=, which defaults to false + if dnsroutes: self.assertRegex(output, r'192.168.5.6 proto dhcp scope link src 192.168.5.181 metric 1024') self.assertRegex(output, r'192.168.5.7 proto dhcp scope link src 192.168.5.181 metric 1024') else: |