]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #12160 from yuwata/wait-online-allow-configuring
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 1 Apr 2019 21:10:36 +0000 (06:10 +0900)
committerGitHub <noreply@github.com>
Mon, 1 Apr 2019 21:10:36 +0000 (06:10 +0900)
wait-online: add --any option

1  2 
test/test-network/systemd-networkd-tests.py

index a246379644858d132f9cd27b402b36a03bba6c92,bd79ff737ed9d54b7950efc971134561bf5ad0f0..ffc63d0838378318455d33a5f5b36cb6e218600a
@@@ -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',
          '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',