feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Further improve QmlProfilerTool test

Browse Source 
Don't close the fake debug server after receiving one connection. The
client might time out after establishing the TCP connection, but before
receiving the hello message.

Also, retry more aggressively, just like we do in the
QmlProfilerClientManager test.

Change-Id: Ib0a6c068c97d8000b599d51f31f90712db219af2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Ulf Hermann
2018-10-11 16:50:35 +02:00
parent cafd5ced1a
commit d1cd39081b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmlprofiler/tests/qmlprofilertool_test.cpp
View File

@@ -54,6 +54,13 @@ void QmlProfilerToolTest::testAttachToWaitingApplication()
settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/kitId"), newKitPtr->id().toSetting());
QmlProfilerTool profilerTool;
QmlProfilerClientManager *clientManager = profilerTool.clientManager();
clientManager->setRetryInterval(10);
clientManager->setMaximumRetries(10);
connect(clientManager, &QmlProfilerClientManager::connectionFailed,
clientManager, &QmlProfilerClientManager::retryConnect);
QTcpServer server;
QUrl serverUrl = Utils::urlFromLocalHostAndFreePort();
QVERIFY(serverUrl.port() >= 0);
@@ -64,7 +71,6 @@ void QmlProfilerToolTest::testAttachToWaitingApplication()
connect(&server, &QTcpServer::newConnection, this, [&]() {
connection.reset(server.nextPendingConnection());
fakeDebugServer(connection.data());
server.close();
});
QTimer timer;
@@ -94,7 +100,7 @@ void QmlProfilerToolTest::testAttachToWaitingApplication()
QTRY_VERIFY(runControl->isRunning());
QTRY_VERIFY(modalSeen);
QTRY_VERIFY(!timer.isActive());
QTRY_VERIFY(profilerTool.clientManager()->isConnected());
QTRY_VERIFY(clientManager->isConnected());
connection.reset();
QTRY_VERIFY(runControl->isStopped());