test-network: rename one .netdev to make the file removed after the test
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 6 Apr 2022 05:41:50 +0000 (14:41 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 6 Apr 2022 09:14:45 +0000 (18:14 +0900)
Follow-up for 7809cab71738aa582ac30e7dbc8d1e76c303ff9e.

test/test-network/conf/25-ip6tnl-external.netdev [deleted file]
test/test-network/conf/25-ip6tnl-tunnel-external.netdev [new file with mode: 0644]
test/test-network/systemd-networkd-tests.py

diff --git a/test/test-network/conf/25-ip6tnl-external.netdev b/test/test-network/conf/25-ip6tnl-external.netdev
deleted file mode 100644 (file)
index 68926cd..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[NetDev]
-Name=ip6tnl-external
-Kind=ip6tnl
-
-[Tunnel]
-Mode=ip6ip6
-External=yes
diff --git a/test/test-network/conf/25-ip6tnl-tunnel-external.netdev b/test/test-network/conf/25-ip6tnl-tunnel-external.netdev
new file mode 100644 (file)
index 0000000..68926cd
--- /dev/null
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+[NetDev]
+Name=ip6tnl-external
+Kind=ip6tnl
+
+[Tunnel]
+Mode=ip6ip6
+External=yes
index 0a8349fd5b8a0c1c0a067796382dbc50d3dcd3c1..d626e4b641e84d2da8544a29a15380096e386566 100755 (executable)
@@ -1711,7 +1711,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
                                         '25-ip6tnl-tunnel-remote-any.netdev', '25-tunnel-remote-any.network',
                                         '25-veth.netdev', '25-ip6tnl-slaac.network', '25-ipv6-prefix.network',
                                         '25-ip6tnl-tunnel-local-slaac.netdev', '25-ip6tnl-tunnel-local-slaac.network',
-                                        '25-ip6tnl-external.netdev', '26-netdev-link-local-addressing-yes.network')
+                                        '25-ip6tnl-tunnel-external.netdev', '26-netdev-link-local-addressing-yes.network')
         start_networkd()
         self.wait_online(['ip6tnl99:routable', 'ip6tnl98:routable', 'ip6tnl97:routable',
                           'ip6tnl-slaac:degraded', 'ip6tnl-external:degraded',