Merge ~paelzer/ubuntu/+source/network-manager:fix-lp-1894619-changed-dnsmasq-behavior into ubuntu/+source/network-manager:ubuntu/impish-devel

[Christian Ehrhardt ]

[Iain Lane (laney)]

Thanks Christian. Assuming you've tested this it looks fine to merge, but two things

  - I'm not sure we shouldn't drop 'dynamic' if that's not expected any more (and bump the required version of dnsmasq then). I could go either way on this - what do you think?
  - Please do the change in https://code.launchpad.net/~network-manager/network-manager/+git/ubuntu/+ref/ubuntu/master

Feel free to make the change, or not, merge and upload - thanks!

review: Approve

[Christian Ehrhardt  (paelzer)]

Hi,
I thought about dropping dynamic - but not ALL test cases switch to forever.
There were a few that still returned dynamic (something with a wireless connection for example).
I decided against a massive matrix of testcase->output and went for the simple yet reasonable change.

[Christian Ehrhardt  (paelzer)]

I wasn't aware of that tree - thanks for the hint, I cloned rebased and pushed the change there as well.

To ssh://git.launchpad.net/ubuntu/+source/network-manager
 * [new tag] upload/1.30.0-1ubuntu4 -> upload/1.30.0-1ubuntu4

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading network-manager_1.30.0-1ubuntu4.dsc: done.
  Uploading network-manager_1.30.0-1ubuntu4.debian.tar.xz: done.
  Uploading network-manager_1.30.0-1ubuntu4_source.buildinfo: done.
  Uploading network-manager_1.30.0-1ubuntu4_source.changes: done.
Successfully uploaded packages.

And to also cover this extra repo:
To git+ssh://git.launchpad.net/network-manager
   87d561d6..9996e637 ubuntu/master -> ubuntu/master

[Christian Ehrhardt  (paelzer)]

This is in proposed and working fine there.

diff --git a/debian/changelog b/debian/changelog
index ec1fe7b..31ddee8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (1.30.0-1ubuntu4) impish; urgency=medium
+
+  * d/t/nm.py: adapt to changes dnsmasq behavior (LP: #1894619)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 02 Jul 2021 11:13:46 +0200
+
 network-manager (1.30.0-1ubuntu3) hirsute; urgency=medium
 
   * SECURITY UPDATE: crash via setting match.path
diff --git a/debian/tests/nm.py b/debian/tests/nm.py
index f4fe46d..529f4cb 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'