diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-01-15 16:07:53 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-15 16:35:31 +0100 |
commit | 005b556489d77ef566dcffcce9d7b4a085dc3959 (patch) | |
tree | de73109e2ed7682ba68b2f6f6312678977e924a0 | |
parent | e6eb64c198db9b6c31ad8ad5124a677d70fbcabb (diff) | |
download | qtlocation-005b556489d77ef566dcffcce9d7b4a085dc3959.tar.gz |
Attempt to fix flaky QNemaPositionInfoSource_Simulation test on Windows
The failure was discovered by https://codereview.qt-project.org/#change,75481
We increase the timeout for the local tcp connection as the likely
reason is an overworked CI system.
In addition we add more verbose output to easy the failure detection
in case this happens again.
Change-Id: I44ee52fcb957dcaa5aca4a6932221a34ce3f2af7
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r-- | tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp index be8dfa78..6bf85173 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp @@ -86,14 +86,21 @@ QNmeaPositionInfoSourceProxy *QNmeaPositionInfoSourceProxyFactory::createProxy(Q { QTcpSocket *client = new QTcpSocket; client->connectToHost(m_server->serverAddress(), m_server->serverPort()); - //qDebug() << "listening on" << m_server->serverAddress() << m_server->serverPort(); - bool b = m_server->waitForNewConnection(5000); - Q_ASSERT(b); + qDebug() << "listening on" << m_server->serverAddress() << m_server->serverPort(); + bool b = m_server->waitForNewConnection(15000); + if (!b) + qWarning() << "Server didin't receive new connection"; b = client->waitForConnected(); - Q_ASSERT(b); + if (!b) + qWarning() << "Client could not connect to server"; //QNmeaPositionInfoSource *source = new QNmeaPositionInfoSource(m_mode); - source->setDevice(m_server->nextPendingConnection()); + QIODevice *device = m_server->nextPendingConnection(); + if (!device) + qWarning() << "Missing pending connection. Test is going to fail."; + else + qWarning() << "Received pending connection:" << device << b; + source->setDevice(device); Q_ASSERT(source->device() != 0); QNmeaPositionInfoSourceProxy *proxy = new QNmeaPositionInfoSourceProxy(source, client); proxy->setParent(source); |