From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 1 Apr 2019 21:10:36 +0000 (+0900)
Subject: Merge pull request #12160 from yuwata/wait-online-allow-configuring
X-Git-Tag: v242-rc1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd09a9ec0f3f32ebedb52ddb8ae983e7de812d14;p=thirdparty%2Fsystemd.git

Merge pull request #12160 from yuwata/wait-online-allow-configuring

wait-online: add --any option
---

dd09a9ec0f3f32ebedb52ddb8ae983e7de812d14
diff --cc test/test-network/systemd-networkd-tests.py
index a2463796448,bd79ff737ed..ffc63d08383
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@@ -248,8 -245,8 +249,9 @@@ class NetworkdNetDevTests(unittest.Test
      units = [
          '10-dropin-test.netdev',
          '11-dummy.netdev',
+         '11-dummy.network',
          '12-dummy.netdev',
 +        '15-name-conflict-test.netdev',
          '21-macvlan.netdev',
          '21-macvtap.netdev',
          '21-vlan-test1.network',
@@@ -259,14 -256,9 +261,15 @@@
          '25-bond.netdev',
          '25-bond-balanced-tlb.netdev',
          '25-bridge.netdev',
+         '25-bridge.network',
          '25-erspan-tunnel-local-any.netdev',
          '25-erspan-tunnel.netdev',
 +        '25-fou-gretap.netdev',
 +        '25-fou-gre.netdev',
 +        '25-fou-ipip.netdev',
 +        '25-fou-ipproto-gre.netdev',
 +        '25-fou-ipproto-ipip.netdev',
 +        '25-fou-sit.netdev',
          '25-geneve.netdev',
          '25-gretap-tunnel-local-any.netdev',
          '25-gretap-tunnel.netdev',