summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/ssl
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-05-08 20:43:45 +0200
committerLiang Qi <liang.qi@qt.io>2018-05-08 20:43:45 +0200
commitb5a956601f369e961d6863126f8facc61bb6df1f (patch)
tree25e4021518b254ef76c410244dd6581432bf285f /tests/auto/network/ssl
parent290f953253afc5935382525cd4b72e091865cab5 (diff)
parent1b7337d23dbc767ba482d9051180f10d77052913 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro Change-Id: I3169f709cc2a1b75007cb23c02c4c79b74feeb04
Diffstat (limited to 'tests/auto/network/ssl')
-rw-r--r--tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp21
1 files changed, 5 insertions, 16 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index bb01116240..de759ae051 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -2908,10 +2908,7 @@ void tst_QSslSocket::qtbug18498_peek2()
QScopedPointer<QSslSocket> server(listener.socket);
QVERIFY(server->write("HELLO\r\n", 7));
- QElapsedTimer stopwatch;
- stopwatch.start();
- while (client->bytesAvailable() < 7 && stopwatch.elapsed() < 5000)
- QTest::qWait(100);
+ QTRY_COMPARE(client->bytesAvailable(), 7);
char c;
QCOMPARE(client->peek(&c,1), 1);
QCOMPARE(c, 'H');
@@ -2930,8 +2927,7 @@ void tst_QSslSocket::qtbug18498_peek2()
bigblock.fill('#', QIODEVICE_BUFFERSIZE + 1024);
QVERIFY(client->write(QByteArray("head")));
QVERIFY(client->write(bigblock));
- while (server->bytesAvailable() < bigblock.length() + 4 && stopwatch.elapsed() < 5000)
- QTest::qWait(100);
+ QTRY_COMPARE(server->bytesAvailable(), bigblock.length() + 4);
QCOMPARE(server->read(4), QByteArray("head"));
QCOMPARE(server->peek(bigblock.length()), bigblock);
b.reserve(bigblock.length());
@@ -2947,10 +2943,7 @@ void tst_QSslSocket::qtbug18498_peek2()
QCOMPARE(server->readAll(), bigblock);
QVERIFY(client->write("STARTTLS\r\n"));
- stopwatch.start();
- // ### Qt5 use QTRY_VERIFY
- while (server->bytesAvailable() < 10 && stopwatch.elapsed() < 5000)
- QTest::qWait(100);
+ QTRY_COMPARE(server->bytesAvailable(), 10);
QCOMPARE(server->peek(&c,1), 1);
QCOMPARE(c, 'S');
b = server->peek(3);
@@ -2983,9 +2976,7 @@ void tst_QSslSocket::qtbug18498_peek2()
client->startClientEncryption();
QVERIFY(server->write("hello\r\n", 7));
- stopwatch.start();
- while (client->bytesAvailable() < 7 && stopwatch.elapsed() < 5000)
- QTest::qWait(100);
+ QTRY_COMPARE(client->bytesAvailable(), 7);
QVERIFY(server->mode() == QSslSocket::SslServerMode && client->mode() == QSslSocket::SslClientMode);
QCOMPARE(client->peek(&c,1), 1);
QCOMPARE(c, 'h');
@@ -2996,9 +2987,7 @@ void tst_QSslSocket::qtbug18498_peek2()
QCOMPARE(client->readAll(), QByteArray("ello\r\n"));
QVERIFY(client->write("goodbye\r\n"));
- stopwatch.start();
- while (server->bytesAvailable() < 9 && stopwatch.elapsed() < 5000)
- QTest::qWait(100);
+ QTRY_COMPARE(server->bytesAvailable(), 9);
QCOMPARE(server->peek(&c,1), 1);
QCOMPARE(c, 'g');
QCOMPARE(server->readAll(), QByteArray("goodbye\r\n"));