From 9865ecf9dbe545b57339366fc248f2eff8d1c41a Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 18 Apr 2018 09:37:58 +0200 Subject: h2 auto test - replace QEventLoop (and QTimer) with QTestEventLoop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QTestEventLoop (conveniently so) takes care of timeouts thus no external QTimer/handling logic needed at all. Change-Id: Id65ea928daec1e7d9380107e63916896f19d3d14 Reviewed-by: Mårten Nordheim Reviewed-by: Edward Welbourne --- tests/auto/network/access/http2/http2.pro | 2 +- tests/auto/network/access/http2/tst_http2.cpp | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'tests/auto/network') diff --git a/tests/auto/network/access/http2/http2.pro b/tests/auto/network/access/http2/http2.pro index e130f30784..62b685e556 100644 --- a/tests/auto/network/access/http2/http2.pro +++ b/tests/auto/network/access/http2/http2.pro @@ -1,4 +1,4 @@ -QT += core core-private network network-private testlib +QT = core core-private network network-private testlib CONFIG += testcase parallel_test c++11 TARGET = tst_http2 diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp index ecf4c5814a..fa56a35c29 100644 --- a/tests/auto/network/access/http2/tst_http2.cpp +++ b/tests/auto/network/access/http2/tst_http2.cpp @@ -110,8 +110,7 @@ private: QThread *workerThread = nullptr; QNetworkAccessManager manager; - QEventLoop eventLoop; - QTimer timer; + QTestEventLoop eventLoop; int nRequests = 0; int nSentRequests = 0; @@ -146,11 +145,6 @@ tst_Http2::tst_Http2() : workerThread(new QThread) { workerThread->start(); - - timer.setInterval(10000); - timer.setSingleShot(true); - - connect(&timer, SIGNAL(timeout()), &eventLoop, SLOT(quit())); } tst_Http2::~tst_Http2() @@ -497,15 +491,12 @@ void tst_Http2::clearHTTP2State() void tst_Http2::runEventLoop(int ms) { - timer.setInterval(ms); - timer.start(); - eventLoop.exec(); + eventLoop.enterLoopMSecs(ms); } void tst_Http2::stopEventLoop() { - timer.stop(); - eventLoop.quit(); + eventLoop.exitLoop(); } Http2Server *tst_Http2::newServer(const Http2::RawSettings &serverSettings, -- cgit v1.2.3