Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-21 22:09:23 +01:00
Code Releases Activity

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

Browse Source 
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/20240227204242.1509980-1-denkenz@gmail.com/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💯:10
nameserver 3ffe:501:ffff💯: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💯:10
nameserver 3ffe:501:ffff💯:50
This commit is contained in:
James Prestwood 2024-02-28 08:36:16 -08:00 committed by Denis Kenzior
parent 52c6a6b8ea
commit cdbd59103e
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
autotests/testNetconfig/slaac_test.py
View File

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