diff options
Diffstat (limited to 'tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp')
-rw-r--r-- | tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 21 |
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")); |