summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hudson-Doyle <michael.hudson@ubuntu.com>2021-10-21 11:19:25 +0200
committerAndrej Shadura <andrewsh@debian.org>2021-10-21 11:19:25 +0200
commit68d8b27beadd360554d5aeed61efb85923b49277 (patch)
tree0a50d16479e9dc5d95c7f0974d930498b4360880
parent5c8dfc059523432e626a1cba4c9f5b8076e0a272 (diff)
Fix ethernets test with network-manage 1.32.10
Origin: vendor Forwarded: no Last-Update: 2021-09-01 NetworkManager's udev rules are smarter about catching renamed veths now, so the udev rule the integration tests use to manage their veths need to list the names the veths are renamed to too. Last-Update: 2021-09-01 Gbp-Pq: Name nm-1.32.10-compat.patch
-rw-r--r--tests/integration/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/integration/base.py b/tests/integration/base.py
index 93ee722..1054059 100644
--- a/tests/integration/base.py
+++ b/tests/integration/base.py
@@ -70,7 +70,7 @@ class IntegrationTestsBase(unittest.TestCase):
# ensure NM can manage our fake eths
os.makedirs('/run/udev/rules.d', exist_ok=True)
with open('/run/udev/rules.d/99-nm-veth-test.rules', 'w') as f:
- f.write('ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}=="eth42|eth43", ENV{NM_UNMANAGED}="0"\n')
+ f.write('ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}=="eth42|eth43|iface1|iface2", ENV{NM_UNMANAGED}="0"\n')
subprocess.check_call(['udevadm', 'control', '--reload'])
os.makedirs('/etc/NetworkManager/conf.d', exist_ok=True)