From 6bfbfce795e42c758e3ffc4d744c8b2a9a1da2b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 9 Dec 2020 10:35:10 +0100 Subject: [PATCH] networkd-test: add final newlines in generated files, use .format() --- test/networkd-test.py | 80 +++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 30 deletions(-) diff --git a/test/networkd-test.py b/test/networkd-test.py index 8496ec881c..5559528c53 100755 --- a/test/networkd-test.py +++ b/test/networkd-test.py @@ -192,33 +192,39 @@ class BridgeTest(NetworkdTestingUtilities, unittest.TestCase): [NetDev] Name=port1 Kind=dummy -MACAddress=12:34:56:78:9a:bc''') +MACAddress=12:34:56:78:9a:bc +''') self.write_network('port2.netdev', '''\ [NetDev] Name=port2 Kind=dummy -MACAddress=12:34:56:78:9a:bd''') +MACAddress=12:34:56:78:9a:bd +''') self.write_network('mybridge.netdev', '''\ [NetDev] Name=mybridge -Kind=bridge''') +Kind=bridge +''') self.write_network('port1.network', '''\ [Match] Name=port1 [Network] -Bridge=mybridge''') +Bridge=mybridge +''') self.write_network('port2.network', '''\ [Match] Name=port2 [Network] -Bridge=mybridge''') +Bridge=mybridge +''') self.write_network('mybridge.network', '''\ [Match] Name=mybridge [Network] DNS=192.168.250.1 Address=192.168.250.33/24 -Gateway=192.168.250.1''') +Gateway=192.168.250.1 +''') subprocess.call(['systemctl', 'reset-failed', 'systemd-networkd', 'systemd-resolved']) subprocess.check_call(['systemctl', 'start', 'systemd-networkd']) @@ -351,10 +357,11 @@ class ClientTestBase(NetworkdTestingUtilities): self.start_unit('systemd-resolved') self.write_network(self.config, '''\ [Match] -Name={} +Name={iface} [Network] -DHCP={} -{}'''.format(self.iface, dhcp_mode, extra_opts)) +DHCP={dhcp_mode} +{extra_opts} +'''.format(iface=self.iface, dhcp_mode=dhcp_mode, extra_opts=extra_opts)) if coldplug: # create interface first, then start networkd @@ -476,14 +483,16 @@ DHCP={} [NetDev] Name=dummy0 Kind=dummy -MACAddress=12:34:56:78:9a:bc''') +MACAddress=12:34:56:78:9a:bc +''') self.write_network('myvpn.network', '''\ [Match] Name=dummy0 [Network] Address=192.168.42.100/24 DNS=192.168.42.1 -Domains= ~company''') +Domains= ~company +''') try: self.do_test(coldplug=True, ipv6=False, @@ -508,13 +517,15 @@ Domains= ~company''') self.write_network('myvpn.netdev', '''[NetDev] Name=dummy0 Kind=dummy -MACAddress=12:34:56:78:9a:bc''') +MACAddress=12:34:56:78:9a:bc +''') self.write_network('myvpn.network', '''[Match] Name=dummy0 [Network] Address=192.168.42.100/24 DNS=192.168.42.1 -Domains= ~company ~.''') +Domains= ~company ~. +''') try: self.do_test(coldplug=True, ipv6=False, @@ -613,7 +624,8 @@ class DnsmasqClientTest(ClientTestBase, unittest.TestCase): Name={} [Network] DHCP=ipv4 -IPv6AcceptRA=False'''.format(self.iface)) +IPv6AcceptRA=False +'''.format(self.iface)) # create second device/dnsmasq for a .company/.lab VPN interface # static IPs for simplicity @@ -639,7 +651,8 @@ Name=testvpnclient IPv6AcceptRA=False Address=10.241.3.2/24 DNS=10.241.3.1 -Domains= ~company ~lab''') +Domains= ~company ~lab +''') self.start_unit('systemd-networkd') subprocess.check_call([NETWORKD_WAIT_ONLINE, '--interface', self.iface, @@ -825,35 +838,37 @@ mount -t tmpfs none /run/systemd/network mount -t tmpfs none /run/systemd/netif [ ! -e /run/dbus ] || mount -t tmpfs none /run/dbus # create router/client veth pair -cat << EOF > /run/systemd/network/test.netdev +cat </run/systemd/network/test.netdev [NetDev] -Name=%(ifr)s +Name={ifr} Kind=veth [Peer] -Name=%(ifc)s +Name={ifc} EOF -cat << EOF > /run/systemd/network/test.network +cat </run/systemd/network/test.network [Match] -Name=%(ifr)s +Name={ifr} [Network] Address=192.168.5.1/24 -%(addr6)s +{addr6} DHCPServer=yes [DHCPServer] PoolOffset=10 PoolSize=50 DNS=192.168.5.1 -%(dhopts)s +{dhopts} EOF # run networkd as in systemd-networkd.service -exec $(systemctl cat systemd-networkd.service | sed -n '/^ExecStart=/ { s/^.*=//; s/^[@+-]//; s/^!*//; p}') -''' % {'ifr': self.if_router, 'ifc': self.iface, 'addr6': ipv6 and 'Address=2600::1/64' or '', - 'dhopts': dhcpserver_opts or ''}) +exec $(systemctl cat systemd-networkd.service | sed -n '/^ExecStart=/ {{ s/^.*=//; s/^[@+-]//; s/^!*//; p}}') +'''.format(ifr=self.if_router, + ifc=self.iface, + addr6=('Address=2600::1/64' if ipv6 else ''), + dhopts=(dhcpserver_opts or ''))) os.fchmod(fd, 0o755) @@ -902,14 +917,16 @@ exec $(systemctl cat systemd-networkd.service | sed -n '/^ExecStart=/ { s/^.*=// [NetDev] Name=dummy0 Kind=dummy -MACAddress=12:34:56:78:9a:bc''') +MACAddress=12:34:56:78:9a:bc +''') self.write_network('test.network', '''\ [Match] Name=dummy0 [Network] Address=192.168.42.100/24 DNS=192.168.42.1 -Domains= one two three four five six seven eight nine ten''') +Domains= one two three four five six seven eight nine ten +''') self.start_unit('systemd-networkd') @@ -929,16 +946,19 @@ Domains= one two three four five six seven eight nine ten''') [NetDev] Name=dummy0 Kind=dummy -MACAddress=12:34:56:78:9a:bc''') +MACAddress=12:34:56:78:9a:bc +''') self.write_network('test.network', '''\ [Match] Name=dummy0 [Network] Address=192.168.42.100/24 -DNS=192.168.42.1''') +DNS=192.168.42.1 +''') self.write_network_dropin('test.network', 'dns', '''\ [Network] -DNS=127.0.0.1''') +DNS=127.0.0.1 +''') self.start_unit('systemd-resolved') self.start_unit('systemd-networkd')