From 13a0f294b5ef2ec8a2057d72365f989ddf6290de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 5 Sep 2024 15:00:10 +0200 Subject: [PATCH] tst_qnetworkreply: localhost may resolve to ipv4 and 6 On some platforms, localhost resolves to both ipv4 and ipv6 addresses. In that case we might get multiple emissions of the socketStartedConnecting signal, for Happy Eyeballs. Pick-to: 6.8 6.7 6.5 Change-Id: Ib39a167bdde2089106c89a3e297cbb0ad2f357d9 Reviewed-by: Timur Pocheptsov --- .../network/access/qnetworkreply/tst_qnetworkreply.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 37412165cc6..e4f43732a98 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -10164,7 +10164,14 @@ void tst_QNetworkReply::moreActivitySignals() QSignalSpy spy3(reply.data(), SIGNAL(metaDataChanged())); QSignalSpy spy4(reply.data(), SIGNAL(finished())); spy1.wait(); - QCOMPARE(spy1.size(), 1); + if (url.host() == u"localhost") { + // localhost may resolve to both v4 and v6, so we may get two + // socketStartedConnecting signals + QCOMPARE_GE(spy1.size(), 1); + QCOMPARE_LE(spy1.size(), 2); + } else { + QCOMPARE(spy1.size(), 1); + } spy2.wait(); QCOMPARE(spy2.size(), 1); spy3.wait();