summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp')
-rw-r--r--tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 69bd78a4f0..0ef3dc0b61 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -7816,13 +7816,14 @@ void tst_QNetworkReply::closeDuringDownload()
QFETCH(QUrl, url);
QNetworkRequest request(url);
QNetworkReply* reply = manager.get(request);
- connect(reply, SIGNAL(readyRead()), &QTestEventLoop::instance(), SLOT(exitLoop()));
- QTestEventLoop::instance().enterLoop(10);
- QVERIFY(!QTestEventLoop::instance().timeout());
- connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+ QSignalSpy readyReadSpy(reply, &QNetworkReply::readyRead);
+ QVERIFY(readyReadSpy.wait(10000));
+ QSignalSpy destroySpy(reply, &QObject::destroyed);
reply->close();
reply->deleteLater();
- QTest::qWait(1000); //cancelling ftp takes some time, this avoids a warning caused by test's cleanup() destroying the connection cache before the abort is finished
+ // Wait for destruction to avoid a warning caused by test's cleanup()
+ // destroying the connection cache before the abort is finished
+ QVERIFY(destroySpy.wait());
}
void tst_QNetworkReply::ftpAuthentication_data()