AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

h2 auto test - replace QEventLoop (and QTimer) with QTestEventLoop

Browse Source 
QTestEventLoop (conveniently so) takes care of timeouts thus no
external QTimer/handling logic needed at all.

Change-Id: Id65ea928daec1e7d9380107e63916896f19d3d14
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Timur Pocheptsov 2018-04-18 09:37:58 +02:00
parent 8e5f6e3bed
commit 9865ecf9db
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/network/access/http2/http2.pro
View File

@ -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

15
tests/auto/network/access/http2/tst_http2.cpp
View File

@ -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,