From 16ed1fe089d2820910830acd3e900587e32a3816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 29 Aug 2024 12:23:28 +0200 Subject: [PATCH] tst_qnetworkreply: Speed up moreActivitySignals Going from 40 seconds to 1. The issue is that wait() doesn't care if there was a signal emitted already, it will just wait 5 seconds for a new one. But we don't care, we just want to know that there was 1. Pick-to: 6.7 6.5 Change-Id: I96f1f00bc6171ccc6e5b2f033fa407de5cf0c0c3 Reviewed-by: Timur Pocheptsov (cherry picked from commit 65494fbd3dff16d4476b5ac8c04df830d9fd61e6) Reviewed-by: Qt Cherry-pick Bot --- .../qnetworkreply/tst_qnetworkreply.cpp | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 7f1af9b9508..12b81cf7751 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -10164,21 +10164,17 @@ void tst_QNetworkReply::moreActivitySignals() QSignalSpy spy2(reply.data(), SIGNAL(requestSent())); QSignalSpy spy3(reply.data(), SIGNAL(metaDataChanged())); QSignalSpy spy4(reply.data(), SIGNAL(finished())); - spy1.wait(); 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); + QTRY_COMPARE_GE(spy1.size(), 1); QCOMPARE_LE(spy1.size(), 2); } else { - QCOMPARE(spy1.size(), 1); + QTRY_COMPARE(spy1.size(), 1); } - spy2.wait(); - QCOMPARE(spy2.size(), 1); - spy3.wait(); - QCOMPARE(spy3.size(), 1); - spy4.wait(); - QCOMPARE(spy4.size(), 1); + QTRY_COMPARE(spy2.size(), 1); + QTRY_COMPARE(spy3.size(), 1); + QTRY_COMPARE(spy4.size(), 1); QVERIFY(reply->error() == QNetworkReply::NoError); // Second request will not send socketStartedConnecting because of keep-alive, so don't check it. QNetworkReplyPtr secondreply; @@ -10191,12 +10187,9 @@ void tst_QNetworkReply::moreActivitySignals() QSignalSpy secondspy2(secondreply.data(), SIGNAL(requestSent())); QSignalSpy secondspy3(secondreply.data(), SIGNAL(metaDataChanged())); QSignalSpy secondspy4(secondreply.data(), SIGNAL(finished())); - secondspy2.wait(); - QCOMPARE(secondspy2.size(), 1); - secondspy3.wait(); - QCOMPARE(secondspy3.size(), 1); - secondspy4.wait(); - QCOMPARE(secondspy4.size(), 1); + QTRY_COMPARE(secondspy2.size(), 1); + QTRY_COMPARE(secondspy3.size(), 1); + QTRY_COMPARE(secondspy4.size(), 1); QVERIFY(secondreply->error() == QNetworkReply::NoError); }