From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [PATCH v2] auto-t: fix netconfig to handle resolvconf values out of order
Date: Wed, 28 Feb 2024 08:36:16 -0800 [thread overview]
Message-ID: <20240228163616.1231620-1-prestwoj@gmail.com> (raw)
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: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(-)
diff --git a/autotests/testNetconfig/slaac_test.py b/autotests/testNetconfig/slaac_test.py
index 26ae0e46..5aeb730e 100644
--- a/autotests/testNetconfig/slaac_test.py
+++ b/autotests/testNetconfig/slaac_test.py
@@ -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'
--
2.34.1
next reply other threads:[~2024-02-28 16:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-28 16:36 James Prestwood [this message]
2024-02-28 17:51 ` [PATCH v2] auto-t: fix netconfig to handle resolvconf values out of order Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240228163616.1231620-1-prestwoj@gmail.com \
--to=prestwoj@gmail.com \
--cc=iwd@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).