test-network: rename tun99 and tap99

The names seem to be used in AWS.

This also merges test_tun() and test_tap().

diff --git a/test/test-network/conf/25-tap.netdev b/test/test-network/conf/25-tap.netdev
index 5c1f97be9ea306356966c3fe24657db47f26227b..f52d2555608240a0f27262d1faaabeccb68ae6ec 100644 (file)
--- a/test/test-network/conf/25-tap.netdev
+++ b/test/test-network/conf/25-tap.netdev
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [NetDev]
-Name=tap99
+Name=testtap99
 Kind=tap
 
 [Tap]

diff --git a/test/test-network/conf/25-tun.netdev b/test/test-network/conf/25-tun.netdev
index ed25026a95925898311312939ccfe0700b58ebc4..8ab2f5a03854583bad93809655c9206e37a5c091 100644 (file)
--- a/test/test-network/conf/25-tun.netdev
+++ b/test/test-network/conf/25-tun.netdev
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [NetDev]
-Name=tun99
+Name=testtun99
 Kind=tun
 
 [Tun]

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 60ed22291c4bc26fad9e06d8a71462ad1bc0fe87..9bff088a18537aefa04f56d9027beaa334579b7c 100755 (executable)
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -1352,24 +1352,18 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         self.assertRegex(output, 'link/ether 12:34:56:78:9a:bf')
         self.assertRegex(output, 'mtu 1800')
 
-    def test_tun(self):
-        copy_network_unit('25-tun.netdev')
+    def test_tuntap(self):
+        copy_network_unit('25-tun.netdev', '25-tap.netdev')
         start_networkd()
 
-        self.wait_online(['tun99:off'], setup_state='unmanaged')
+        self.wait_online(['testtun99:off', 'testtap99:off'], setup_state='unmanaged')
 
-        output = check_output('ip -d link show tun99')
+        output = check_output('ip -d link show testtun99')
         print(output)
         # Old ip command does not support IFF_ flags
         self.assertRegex(output, 'tun (type tun pi on vnet_hdr on multi_queue|addrgenmode) ')
 
-    def test_tap(self):
-        copy_network_unit('25-tap.netdev')
-        start_networkd()
-
-        self.wait_online(['tap99:off'], setup_state='unmanaged')
-
-        output = check_output('ip -d link show tap99')
+        output = check_output('ip -d link show testtap99')
         print(output)
         # Old ip command does not support IFF_ flags
         self.assertRegex(output, 'tun (type tap pi on vnet_hdr on multi_queue|addrgenmode) ')