From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 2 Dec 2016 14:14:27 +0000 (-0500)
Subject: Merge pull request #4228 from dm0-/coreos-1554
X-Git-Tag: v233~362
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=169f11d5dab59c54888aae545b5ea787ef727224;p=thirdparty%2Fsystemd.git

Merge pull request #4228 from dm0-/coreos-1554

networkd: support marking links unmanaged
---

169f11d5dab59c54888aae545b5ea787ef727224
diff --cc test/networkd-test.py
index 2461155f8bc,aed51392750..a932d32b92a
--- a/test/networkd-test.py
+++ b/test/networkd-test.py
@@@ -176,23 -244,23 +244,23 @@@ DHCP=%
  
              # check networkctl state
              out = subprocess.check_output(['networkctl'])
 -            self.assertRegex(out, ('%s\s+ether\s+routable\s+unmanaged' % self.if_router).encode())
 -            self.assertRegex(out, ('%s\s+ether\s+routable\s+configured' % self.iface).encode())
 +            self.assertRegex(out, (r'%s\s+ether\s+routable\s+unmanaged' % self.if_router).encode())
 +            self.assertRegex(out, (r'%s\s+ether\s+routable\s+configured' % self.iface).encode())
  
              out = subprocess.check_output(['networkctl', 'status', self.iface])
 -            self.assertRegex(out, b'Type:\s+ether')
 -            self.assertRegex(out, b'State:\s+routable.*configured')
 -            self.assertRegex(out, b'Address:\s+192.168.5.\d+')
 +            self.assertRegex(out, br'Type:\s+ether')
 +            self.assertRegex(out, br'State:\s+routable.*configured')
 +            self.assertRegex(out, br'Address:\s+192.168.5.\d+')
              if ipv6:
 -                self.assertRegex(out, b'2600::')
 +                self.assertRegex(out, br'2600::')
              else:
 -                self.assertNotIn(b'2600::', out)
 -            self.assertRegex(out, b'fe80::')
 -            self.assertRegex(out, b'Gateway:\s+192.168.5.1')
 -            self.assertRegex(out, b'DNS:\s+192.168.5.1')
 +                self.assertNotIn(br'2600::', out)
 +            self.assertRegex(out, br'fe80::')
 +            self.assertRegex(out, br'Gateway:\s+192.168.5.1')
 +            self.assertRegex(out, br'DNS:\s+192.168.5.1')
          except (AssertionError, subprocess.CalledProcessError):
              # show networkd status, journal, and DHCP server log on failure
-             with open(self.config) as f:
+             with open(os.path.join(NETWORK_UNITDIR, self.config)) as f:
                  print('\n---- %s ----\n%s' % (self.config, f.read()))
              print('---- interface status ----')
              sys.stdout.flush()