Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I2214c13d1dab22dece20b536454833672faa6296

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);