summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2020-03-18 19:13:05 +0000
committerMårten Nordheim <marten.nordheim@qt.io>2020-03-19 08:58:41 +0000
commit2437f81b0022f9524ca467e28c889d8683c464cf (patch)
tree0c21ded3c4dabd059f881e82b8d44f84befcc2aa
parent8c4b6d212c72b8bb59bc687cbc35bbdebe112434 (diff)
downloadqtwebsockets-2437f81b0022f9524ca467e28c889d8683c464cf.tar.gz
Revert "Speculatively increase timeouts in tst_qwebsocket"
This reverts commit 8c4b6d212c72b8bb59bc687cbc35bbdebe112434. Reason for revert: It didn't fix the issue Change-Id: I11490a968746255e6f7fd906cddcc3ee36ca6201 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
-rw-r--r--tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
index dce9b5c..71e1262 100644
--- a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
+++ b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
@@ -439,7 +439,7 @@ void tst_QWebSocket::tst_sendTextMessage()
socket.sendTextMessage(QStringLiteral("Hello world!"));
QVERIFY(socket.bytesToWrite() > 12); // 12 + a few extra bytes for header
- QVERIFY(textMessageReceived.wait(1500));
+ QVERIFY(textMessageReceived.wait(500));
QCOMPARE(socket.bytesToWrite(), 0);
QCOMPARE(textMessageReceived.count(), 1);
@@ -505,7 +505,7 @@ void tst_QWebSocket::tst_sendTextMessage()
socket.sendTextMessage(QStringLiteral("Hello world!"));
- QVERIFY(textMessageReceived.wait(1500));
+ QVERIFY(textMessageReceived.wait(500));
QCOMPARE(textMessageReceived.count(), 1);
QCOMPARE(binaryMessageReceived.count(), 0);
QCOMPARE(binaryFrameReceived.count(), 0);
@@ -551,7 +551,7 @@ void tst_QWebSocket::tst_sendBinaryMessage()
socket.sendBinaryMessage(QByteArrayLiteral("Hello world!"));
QVERIFY(socket.bytesToWrite() > 12); // 12 + a few extra bytes for header
- QVERIFY(binaryMessageReceived.wait(1500));
+ QVERIFY(binaryMessageReceived.wait(500));
QCOMPARE(socket.bytesToWrite(), 0);
QCOMPARE(textMessageReceived.count(), 0);
@@ -583,7 +583,7 @@ void tst_QWebSocket::tst_sendBinaryMessage()
socket.sendBinaryMessage(QByteArrayLiteral("Hello world!"));
- QVERIFY(binaryMessageReceived.wait(1500));
+ QVERIFY(binaryMessageReceived.wait(500));
QCOMPARE(textMessageReceived.count(), 0);
QCOMPARE(textFrameReceived.count(), 0);
QCOMPARE(binaryMessageReceived.count(), 1);
@@ -719,7 +719,7 @@ void tst_QWebSocket::tst_moveToThread()
socket->asyncOpen(url);
if (socketConnectedSpy.count() == 0)
- QVERIFY(socketConnectedSpy.wait(1500));
+ QVERIFY(socketConnectedSpy.wait(500));
socket->asyncSendTextMessage(textMessage);