1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QTcpSocket::connectToHostError - increase the timeout

Browse Source 
As suggested by the message from QTestLib. This, indeed, fixed the
sadistic test. Also, make sure resources are not leaked.

Pick-to: 5.15
Fixes: QTBUG-87009
Change-Id: Id693a5a562ea5ebacc853e5fc0ab9654ba851e72
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Timur Pocheptsov 2020-10-08 15:21:22 +02:00
parent e5e89d17b3
commit cd6d53610a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
View File

@ -81,6 +81,8 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <memory>
#include "private/qhostinfo_p.h" #include "private/qhostinfo_p.h"
#include "../../../network-settings.h" #include "../../../network-settings.h"
@ -2098,7 +2100,7 @@ void tst_QTcpSocket::connectToHostError_data()
void tst_QTcpSocket::connectToHostError() void tst_QTcpSocket::connectToHostError()
{ {
QTcpSocket *socket = newSocket(); std::unique_ptr<QTcpSocket> socket(newSocket());
QAbstractSocket::SocketError error = QAbstractSocket::UnknownSocketError; QAbstractSocket::SocketError error = QAbstractSocket::UnknownSocketError;
@ -2106,15 +2108,14 @@ void tst_QTcpSocket::connectToHostError()
QFETCH(int, port); QFETCH(int, port);
QFETCH(QAbstractSocket::SocketError, expectedError); QFETCH(QAbstractSocket::SocketError, expectedError);
connect(socket, &QAbstractSocket::errorOccurred, [&](QAbstractSocket::SocketError socketError){ connect(socket.get(), &QAbstractSocket::errorOccurred, [&](QAbstractSocket::SocketError socketError){
error = socketError; error = socketError;
}); });
socket->connectToHost(host, port); // no service running here, one suspects socket->connectToHost(host, port); // no service running here, one suspects
QTRY_COMPARE(socket->state(), QTcpSocket::UnconnectedState); QTRY_COMPARE_WITH_TIMEOUT(socket->state(), QTcpSocket::UnconnectedState, 7000);
if (error != expectedError && error == QAbstractSocket::ConnectionRefusedError) if (error != expectedError && error == QAbstractSocket::ConnectionRefusedError)
QEXPECT_FAIL("unreachable", "CI firewall interfers with this test", Continue); QEXPECT_FAIL("unreachable", "CI firewall interfers with this test", Continue);
QCOMPARE(error, expectedError); QCOMPARE(error, expectedError);
delete socket;
} }
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------