Skip to contentSkip to conversation

auto-t: fix netconfig to handle resolvconf values out of order

PATCH Applied James Prestwood 2 participants 2 messages Feb 28, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 auto-t: fix netconfig to handle resolvconf values out of order

The slaac_test was one that would occationally fail, but very rarely, due to the resolvconf log values appearing in an unexpected order.

This appears to be related to a typo in netconfig-commit which would not set netconfig-domains and instead set dns_list. This was fixed with a pending patch:

https://lore.kernel.org/iwd/[email protected]/T/#u

But applying this now leads to testNetconfig failing slaac_test 100% of the time.

I'm not familiar enough with resolveconf to know if this test change is ok, but based on the test behavior the expected log and disk logs are the same, just in the incorrect order. I'm not sure if this the log order is deterministic so instead the check now iterates the expected log and verifies each value appears once in the resolvconf log.

Here is an example of the expected vs disk logs after running the test:

Expected:

-a wlan1.dns
nameserver 192.168.1.2
nameserver 3ffe:501:ffff:100::10
nameserver 3ffe:501:ffff:100::50
-a wlan1.domain
search test1
search test2

Resolvconf log:

-a wlan1.domain
search test1
search test2
-a wlan1.dns
nameserver 192.168.1.2
nameserver 3ffe:501:ffff:100::10
nameserver 3ffe:501:ffff:100::50

---
 autotests/testNetconfig/slaac_test.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
autotests/testNetconfig/slaac_test.py +14 -7
index 26ae0e46..5aeb730e 100644
@@ -81,14 +81,21 @@ class Test(unittest.TestCase):
         self.assertEqual(expected_routes6, set(testutil.get_routes6(ifname)))
 
         rclog = open('/tmp/resolvconf.log', 'r')
-        entries = rclog.readlines()
+        entries = [l.strip() for l in rclog.readlines()[-7:]]
         rclog.close()
-        expected_rclog = ['-a %s.dns\n' % (ifname,), 'nameserver 192.168.1.2\n',
-                'nameserver 3ffe:501:ffff:100::10\n', 'nameserver 3ffe:501:ffff:100::50\n',
-                '-a %s.domain\n' % (ifname,), 'search test1\n', 'search test2\n']
-        # Every resolvconf -a run overwrites the previous settings.  Check the last seven lines
-        # of our log since we care about the end result here.
-        self.assertEqual(expected_rclog, entries[-7:])
+        expected_rclog = [
+            '-a %s.dns' % (ifname,),
+            'nameserver 192.168.1.2',
+            'nameserver 3ffe:501:ffff:100::10',
+            'nameserver 3ffe:501:ffff:100::50',
+            '-a %s.domain' % (ifname,),
+            'search test1',
+            'search test2'
+        ]
+
+        for line in expected_rclog:
+            self.assertIn(line, entries)
+            expected_rclog.remove(line)
 
         device.disconnect()
         condition = 'not obj.connected'
Signature · 1 line
2.34.1
#1 lore raw

Hi James,

Quoted 41 lines · James Prestwood

The slaac_test was one that would occationally fail, but very rarely, due to the resolvconf log values appearing in an unexpected order.

This appears to be related to a typo in netconfig-commit which would not set netconfig-domains and instead set dns_list. This was fixed with a pending patch:

https://lore.kernel.org/iwd/[email protected]/T/#u

But applying this now leads to testNetconfig failing slaac_test 100% of the time.

I'm not familiar enough with resolveconf to know if this test change is ok, but based on the test behavior the expected log and disk logs are the same, just in the incorrect order. I'm not sure if this the log order is deterministic so instead the check now iterates the expected log and verifies each value appears once in the resolvconf log.

Here is an example of the expected vs disk logs after running the test:

Expected:

-a wlan1.dns
nameserver 192.168.1.2
nameserver 3ffe:501:ffff:100::10
nameserver 3ffe:501:ffff:100::50
-a wlan1.domain
search test1
search test2

Resolvconf log:

-a wlan1.domain
search test1
search test2
-a wlan1.dns
nameserver 192.168.1.2
nameserver 3ffe:501:ffff:100::10
nameserver 3ffe:501:ffff:100::50

Quoted 4 lines
---
  autotests/testNetconfig/slaac_test.py | 21 ++++++++++++++-------
  1 file changed, 14 insertions(+), 7 deletions(-)

Applied, thanks.

Regards,
-Denis