From 1420ee85165c03bac2aa1678b295f7b1ebe44f51 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 30 Sep 2024 09:15:39 -0700 Subject: [PATCH] tst_QDnsLookup: don't add duplicate 'nameserver' lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I don't know why systemd-resolved did have those for me, but it did, so QtTest complains. QWARN : tst_QDnsLookup::setNameserver() Duplicate data tag "..." - please rename. Pick-to: 6.8 Change-Id: I8df70eb429682b529ecefffd0aca735f94d77225 Reviewed-by: Tor Arne Vestbø Reviewed-by: Mårten Nordheim --- tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp index 8b3b49a14ef..40a399de91d 100644 --- a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp +++ b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp @@ -128,8 +128,9 @@ static QList systemNameservers(QDnsLookup::Protocol protocol) if (!line.startsWith(command)) continue; - QString addr = QLatin1StringView(line).mid(sizeof(command)); - result.emplaceBack(addr); + QHostAddress addr(QLatin1StringView(line).mid(sizeof(command))); + if (!result.contains(addr)) + result.emplaceBack(std::move(addr)); } }; parseFile("/etc/resolv.conf"_L1);