diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-10-08 15:21:22 +0200 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-10-08 22:09:44 +0200 |
commit | cd6d53610ae9a4d075e8575235ce3c8bd893cf2a (patch) | |
tree | f971e6ded66fbc4b5d0eae5c1c8cb33ecd64d393 /tests/auto | |
parent | e5e89d17b36a808192aa5b0c949a4ac1fc4a08ea (diff) |
tst_QTcpSocket::connectToHostError - increase the timeout
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>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 00fcf4afa4..0608fa8e63 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -81,6 +81,8 @@ #include <unistd.h> #endif +#include <memory> + #include "private/qhostinfo_p.h" #include "../../../network-settings.h" @@ -2098,7 +2100,7 @@ void tst_QTcpSocket::connectToHostError_data() void tst_QTcpSocket::connectToHostError() { - QTcpSocket *socket = newSocket(); + std::unique_ptr<QTcpSocket> socket(newSocket()); QAbstractSocket::SocketError error = QAbstractSocket::UnknownSocketError; @@ -2106,15 +2108,14 @@ void tst_QTcpSocket::connectToHostError() QFETCH(int, port); QFETCH(QAbstractSocket::SocketError, expectedError); - connect(socket, &QAbstractSocket::errorOccurred, [&](QAbstractSocket::SocketError socketError){ + connect(socket.get(), &QAbstractSocket::errorOccurred, [&](QAbstractSocket::SocketError socketError){ error = socketError; }); 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) QEXPECT_FAIL("unreachable", "CI firewall interfers with this test", Continue); QCOMPARE(error, expectedError); - delete socket; } //---------------------------------------------------------------------------------- |