summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hudson-Doyle <michael.hudson@ubuntu.com>2022-03-03 09:49:45 +0100
committerLukas Märdian <luk@slyon.de>2022-03-03 09:49:45 +0100
commitc31c8cbf74b002f18228286bd4e4b20bc675e2ea (patch)
tree0e95b45fb239e4a068cbb7cc6db6918a966b121f
parentab0d9543d9413157635f875a3c2b61b87c49e222 (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)