From 16dde302d586a84b34dc74099058117472017203 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Fri, 2 Jul 2021 10:52:31 +0200 Subject: d/t/nm.py: adapt to changes dnsmasq behavior (LP: #1894619) As described and discussed in (LP: #1894619) the behavior of dnsmasq has changes. After reverting that for a while upstream confirmed that - at least for the configuration our test uses - this is the intended and wanted behavior. Due to that dnsmasq now (Impish) follows upstream and therefore the test in NM needs to be adapted to tolerate that new behavior. Signed-off-by: Christian Ehrhardt --- debian/tests/nm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/tests/nm.py b/debian/tests/nm.py index f4fe46d6..529f4cb4 100755 --- a/debian/tests/nm.py +++ b/debian/tests/nm.py @@ -357,7 +357,7 @@ class NetworkManagerTest(network_test_base.NetworkTestBase): expected_ip_a.append('inet6 2600::[0-9a-f]+/') else: # has address with our prefix and MAC - expected_ip_a.append('inet6 2600::[0-9a-f:]+/64 scope global (?:tentative )?(?:mngtmpaddr )?(?:noprefixroute )?dynamic') + expected_ip_a.append('inet6 2600::[0-9a-f:]+/64 scope global (?:tentative )?(?:mngtmpaddr )?(?:noprefixroute )?(dynamic|\n\s*valid_lft forever preferred_lft forever)') # has address with our prefix and random IP (Privacy # Extension), if requested priv_re = 'inet6 2600:[0-9a-f:]+/64 scope global temporary (?:tentative )?(?:mngtmpaddr )?dynamic' -- cgit 1.3.0-6-gf8a5