From 5cdc7c89cb437eb46fb24ad62b9792c1b8aa4d69 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 6 Aug 2022 07:04:19 +0900 Subject: [PATCH] test-network: rename tun99 and tap99 The names seem to be used in AWS. This also merges test_tun() and test_tap(). --- test/test-network/conf/25-tap.netdev | 2 +- test/test-network/conf/25-tun.netdev | 2 +- test/test-network/systemd-networkd-tests.py | 16 +++++----------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/test/test-network/conf/25-tap.netdev b/test/test-network/conf/25-tap.netdev index 5c1f97be9e..f52d255560 100644 --- 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 ed25026a95..8ab2f5a038 100644 --- 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 60ed22291c..9bff088a18 100755 --- 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) ') -- 2.25.1