From: Yu Watanabe Date: Tue, 2 Nov 2021 04:06:48 +0000 (+0900) Subject: test-network: add a testcase for Router= setting X-Git-Tag: v250-rc1~365^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F21210%2Fhead;p=thirdparty%2Fsystemd.git test-network: add a testcase for Router= setting --- diff --git a/test/test-network/conf/dhcp-server.network b/test/test-network/conf/dhcp-server.network index 07ff0f65bc3..3eb931f671c 100644 --- a/test/test-network/conf/dhcp-server.network +++ b/test/test-network/conf/dhcp-server.network @@ -11,3 +11,4 @@ ServerAddress=192.168.5.1/24 PoolOffset=10 PoolSize=50 UplinkInterface=dummy98 +Router=192.168.5.3 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 7eb94a32d35..b12960f794c 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -3977,10 +3977,10 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): output = check_output(*networkctl_cmd, '-n', '0', 'status', 'veth99', env=env) print(output) - self.assertRegex(output, '192.168.5.*') - self.assertRegex(output, 'Gateway: 192.168.5.1') - self.assertRegex(output, 'DNS: 192.168.5.1') - self.assertRegex(output, 'NTP: 192.168.5.1') + self.assertRegex(output, 'Address: 192.168.5.[0-9]* \(DHCP4 via 192.168.5.1\)') + self.assertIn('Gateway: 192.168.5.3', output) + self.assertIn('DNS: 192.168.5.1', output) + self.assertIn('NTP: 192.168.5.1', output) def test_emit_router_timezone(self): copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client-timezone-router.network', 'dhcp-server-timezone-router.network') @@ -3989,9 +3989,9 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): output = check_output(*networkctl_cmd, '-n', '0', 'status', 'veth99', env=env) print(output) - self.assertRegex(output, 'Gateway: 192.168.5.*') - self.assertRegex(output, '192.168.5.*') - self.assertRegex(output, 'Europe/Berlin') + self.assertRegex(output, 'Address: 192.168.5.[0-9]* \(DHCP4 via 192.168.5.1\)') + self.assertIn('Gateway: 192.168.5.1', output) + self.assertIn('Time Zone: Europe/Berlin', output) def test_dhcp_server_static_lease(self): copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client-static-lease.network', 'dhcp-server-static-lease.network') @@ -4000,7 +4000,7 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): output = check_output(*networkctl_cmd, '-n', '0', 'status', 'veth99', env=env) print(output) - self.assertIn('10.1.1.200 (DHCP4 via 10.1.1.1)', output) + self.assertIn('Address: 10.1.1.200 (DHCP4 via 10.1.1.1)', output) class NetworkdDHCPServerRelayAgentTests(unittest.TestCase, Utilities): links = [