diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-05-29 16:38:08 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-05-29 17:07:06 +0900 |
| commit | 931d11057cf30f3ccad682fd966853b7f694827e (patch) | |
| tree | 46322752593f4fb8ad2dcc3328ea36136863edb5 /test | |
| parent | b8d88b26f3020c602a240b5b5003e19903490d70 (diff) | |
| download | systemd-931d11057cf30f3ccad682fd966853b7f694827e.tar.gz | |
test-network: drop 25-nlmon.network
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-network/conf/25-nlmon.network | 6 | ||||
| -rw-r--r-- | test/test-network/conf/netdev-link-local-addressing-yes.network | 1 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/test/test-network/conf/25-nlmon.network b/test/test-network/conf/25-nlmon.network deleted file mode 100644 index 8247f65307..0000000000 --- a/test/test-network/conf/25-nlmon.network +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Name=nlmon99 - -[Network] -LinkLocalAddressing=yes -IPv6AcceptRA=no diff --git a/test/test-network/conf/netdev-link-local-addressing-yes.network b/test/test-network/conf/netdev-link-local-addressing-yes.network index 2e874249a2..b76bfb3bd3 100644 --- a/test/test-network/conf/netdev-link-local-addressing-yes.network +++ b/test/test-network/conf/netdev-link-local-addressing-yes.network @@ -11,6 +11,7 @@ Name=vxcan-peer Name=vrf99 Name=geneve99 Name=ipiptun99 +Name=nlmon99 [Network] LinkLocalAddressing=yes diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index cd99e5787a..01db342eaf 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -346,7 +346,6 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '25-macsec.netdev', '25-macsec.network', '25-nlmon.netdev', - '25-nlmon.network', '25-sit-tunnel-local-any.netdev', '25-sit-tunnel-remote-any.netdev', '25-sit-tunnel.netdev', @@ -1008,7 +1007,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, '0: PN [0-9]*, state off, key 02030400000000000000000000000000') def test_nlmon(self): - self.copy_unit_to_networkd_unit_path('25-nlmon.netdev', '25-nlmon.network') + self.copy_unit_to_networkd_unit_path('25-nlmon.netdev', 'netdev-link-local-addressing-yes.network') self.start_networkd() self.wait_online(['nlmon99:carrier']) |