Merge ~danilogondolfo/network-manager/+git/network-manager:lp2023183 into network-manager:ubuntu/master

[Danilo Egea Gondolfo]

[Danilo Egea Gondolfo (danilogondolfo)]

We seem to be hitting the race condition described in the comments in debian/tests/network_test_base.py on arm64. A few tests are consistently failing there.

Increasing the waiting time between creating and reading the veth pair MAC address seems to fix the issue.

It would be good to have this in mantic as well if possible.

Without the extra waiting time:

https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-danilogondolfo-network-manager2/mantic/arm64/n/network-manager/20231025_194552_7ade5@/log.gz

With the extra waiting time:

https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-danilogondolfo-network-manager2/mantic/arm64/n/network-manager/20231025_220809_b5452@/log.gz

https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-danilogondolfo-network-manager2/mantic/arm64/n/network-manager/20231025_230748_f5cb2@/log.gz

[Lukas Märdian (slyon)]

Thanks for providing real autopkgtest results!

LGTM. I will cherry-pick your commit 8fd8f8a into my pending upload for Noble, dropping your d/changelog commit.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 6d2b453..bc8d02b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+network-manager (1.44.2-1ubuntu3) noble; urgency=medium
+
+  * debian/tests/network_test_base.py:
+    Increase the waiting time between creating a veth pair and reading their
+    MAC addresses. On arm64, the system is taking longer to change the MAC
+    after creation, leading to failures due to differences in the expected
+    and current MAC addresses. See LP# 2023183.
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Thu, 26 Oct 2023 10:01:23 +0100
+
 network-manager (1.44.2-1ubuntu2) noble; urgency=medium
 
   [ Lukas Märdian ]
diff --git a/debian/tests/network_test_base.py b/debian/tests/network_test_base.py
index be7c86f..c65be61 100644
--- a/debian/tests/network_test_base.py
+++ b/debian/tests/network_test_base.py
@@ -127,7 +127,7 @@ class NetworkTestBase(unittest.TestCase):
         # systemd, as it  will change the initial MAC address after the device
         # was created and networkd took control. Give it some time, so we read
         # the correct MAC address
-        time.sleep(0.1)
+        time.sleep(1)
         with open("/sys/class/net/%s/address" % klass.dev_w_ap) as f:
             klass.mac_w_ap = f.read().strip().upper()
         with open("/sys/class/net/%s/address" % klass.dev_w_client) as f: