diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:56:39 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:56:45 +0100 |
commit | 4e14b6b6fe22011c01cf6ec9fad8f3536b288d13 (patch) | |
tree | 8da5b8a3e50c2004976444a3d04411d2a02da632 | |
parent | 5778652ada0763deb6a61479b2410e1f68542ce9 (diff) | |
parent | 79f3f76ac60e656683a2ef8ac4e82bc64d742337 (diff) | |
download | qtwebsockets-4e14b6b6fe22011c01cf6ec9fad8f3536b288d13.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
-rw-r--r-- | tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp index a56594c..62d8d43 100644 --- a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp +++ b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp @@ -781,7 +781,7 @@ void tst_QWebSocketServer::tst_handshakeTimeout() setupSecureServer(&secureServer); if (QTest::currentTestFailed()) return; - secureServer.setHandshakeTimeout(500); + secureServer.setHandshakeTimeout(2000); QSignalSpy secureServerConnectionSpy(&secureServer, SIGNAL(newConnection())); @@ -796,6 +796,11 @@ void tst_QWebSocketServer::tst_handshakeTimeout() QCOMPARE(secureServerConnectionSpy.count(), 0); QWebSocket secureSocket; + connect(&secureSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), + [](QAbstractSocket::SocketError error) { + // This shouldn't print but it's useful for debugging when/if it does. + qDebug() << "Error occurred in the client:" << error; + }); QSslConfiguration config = secureSocket.sslConfiguration(); config.setPeerVerifyMode(QSslSocket::VerifyNone); secureSocket.setSslConfiguration(config); |