From 3e9d555241ac44301afe667ea855b7887a96c126 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 3 Feb 2019 04:36:36 +0100 Subject: [PATCH 1/2] test-network: fix test_dhcp_server() and test_ipv6_prefix_delegation() The tests have been broken since 30d3b54ebad41082e99cabbee815cb113aa0b5c4. --- test/test-network/systemd-networkd-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 298683fe94e..38599287d3a 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1061,7 +1061,7 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): 'dhcp-client-listen-port.network', 'dhcp-client-route-metric.network', 'dhcp-client-route-table.network', - 'dhcp-client.network' + 'dhcp-client.network', 'dhcp-server-veth-peer.network', 'dhcp-v4-server-veth-peer.network', 'static.network'] From f5d191a9e7497fe2ae5c036d852c97eaf774e8c7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 3 Feb 2019 04:37:51 +0100 Subject: [PATCH 2/2] test-network: add or drop whitespace --- test/test-network/systemd-networkd-tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 38599287d3a..6e3bcf5df12 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1021,7 +1021,7 @@ class NetworkdNetworkDHCPServerTests(unittest.TestCase, Utilities): self.assertRegex(output, 'NTP: 192.168.5.1') def test_domain(self): - self.copy_unit_to_networkd_unit_path( '12-dummy.netdev', '24-search-domain.network') + self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '24-search-domain.network') self.start_networkd() self.assertTrue(self.link_exits('dummy98')) @@ -1078,7 +1078,7 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.remove_log_file() def test_dhcp_client_ipv6_only(self): - self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network','dhcp-client-ipv6-only.network') + self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv6-only.network') self.start_networkd() self.assertTrue(self.link_exits('veth99')) @@ -1091,7 +1091,7 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities): self.assertNotRegex(output, '192.168.5') def test_dhcp_client_ipv4_only(self): - self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network','dhcp-client-ipv4-only-ipv6-disabled.network') + self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv4-only-ipv6-disabled.network') self.start_networkd() self.assertTrue(self.link_exits('veth99'))