summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-15 03:02:07 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-15 03:02:07 +0200
commitc2b7d3dc209fe6652571f1dcdd78fb92155e7b8b (patch)
tree2285ce189833ad5afe9094a456d0f35fe3243b06 /tests
parent8f7a3af705f843101b834ffd24aeaeefe0da35c0 (diff)
parentccd820c0d215db1de3b0b018cfc329da5ac718e2 (diff)
downloadqtwebsockets-c2b7d3dc209fe6652571f1dcdd78fb92155e7b8b.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ide4779154e5b79b7068747272855fa43577cd6ae
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
index 20d7060..c40bb01 100644
--- a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
+++ b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
@@ -294,6 +294,18 @@ void tst_QWebSocketServer::tst_settersAndGetters()
QCOMPARE(sslServer.sslConfiguration(), sslConfiguration);
QVERIFY(sslServer.sslConfiguration() != QSslConfiguration::defaultConfiguration());
#endif
+
+ server.setHandshakeTimeout(64);
+ QCOMPARE(server.handshakeTimeoutMS(), 64);
+#if QT_HAS_INCLUDE(<chrono>)
+ auto expected = std::chrono::milliseconds(64);
+ QCOMPARE(server.handshakeTimeout(), expected);
+
+ expected = std::chrono::milliseconds(242);
+ server.setHandshakeTimeout(expected);
+ QCOMPARE(server.handshakeTimeoutMS(), 242);
+ QCOMPARE(server.handshakeTimeout(), expected);
+#endif
}
void tst_QWebSocketServer::tst_listening()