From 36e277e91732d6d75fb6d9cb691fe9c0f83f6178 Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Wed, 23 Oct 2019 17:21:49 +0300 Subject: Add a transfer timeout at QNAM level as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-3443 Change-Id: Idc4d3c9b1ace69bd8b6456506778116a3e8a5490 Reviewed-by: Mårten Nordheim --- .../access/qnetworkreply/tst_qnetworkreply.cpp | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp') diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 3bc6717d58..c523b0c20e 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -9369,6 +9369,19 @@ void tst_QNetworkReply::getWithTimeout() QCOMPARE(spy2.count(), 1); QVERIFY(reply2->error() == QNetworkReply::OperationCanceledError); + + request.setTransferTimeout(0); + manager.setTransferTimeout(1000); + + QNetworkReplyPtr reply3(manager.get(request)); + QSignalSpy spy3(reply3.data(), SIGNAL(error(QNetworkReply::NetworkError))); + + QCOMPARE(waitForFinish(reply3), int(Failure)); + + QCOMPARE(spy3.count(), 1); + QVERIFY(reply3->error() == QNetworkReply::OperationCanceledError); + + manager.setTransferTimeout(0); } void tst_QNetworkReply::postWithTimeout() @@ -9396,6 +9409,19 @@ void tst_QNetworkReply::postWithTimeout() QCOMPARE(spy2.count(), 1); QVERIFY(reply2->error() == QNetworkReply::OperationCanceledError); + + request.setTransferTimeout(0); + manager.setTransferTimeout(1000); + + QNetworkReplyPtr reply3(manager.post(request, postData)); + QSignalSpy spy3(reply3.data(), SIGNAL(error(QNetworkReply::NetworkError))); + + QCOMPARE(waitForFinish(reply3), int(Failure)); + + QCOMPARE(spy3.count(), 1); + QVERIFY(reply3->error() == QNetworkReply::OperationCanceledError); + + manager.setTransferTimeout(0); } // NOTE: This test must be last testcase in tst_qnetworkreply! -- cgit v1.2.3