diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 10:38:57 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 11:03:18 +0200 |
commit | c8ca300e491c186304d0864a9e870337e891e6f7 (patch) | |
tree | f1d991c5960b5acc0bf2a709960e871d48d91acf /tests/auto/network | |
parent | 31c96d34d27f8cad020238df28c10a71b2c4a34f (diff) | |
parent | 8b540f68a8404e4b9e3ac65a22c11416a91ee749 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/src.pro
Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
Diffstat (limited to 'tests/auto/network')
-rw-r--r-- | tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 85b60686d6..a15daf660a 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -947,7 +947,8 @@ void tst_QSslSocket::protocol() socket->abort(); QCOMPARE(socket->protocol(), QSsl::TlsV1SslV3); socket->connectToHost(QtNetworkSettings::serverName(), 443); - QVERIFY2(socket->waitForConnected(), qPrintable(socket->errorString())); + if (setProxy && !socket->waitForConnected()) + QSKIP("Skipping flaky test - See QTBUG-29941"); socket->startClientEncryption(); if (setProxy && !socket->waitForEncrypted()) QSKIP("Skipping flaky test - See QTBUG-29941"); @@ -1263,7 +1264,9 @@ void tst_QSslSocket::setSslConfiguration() this->socket = socket.data(); socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 443); QFETCH(bool, works); - QCOMPARE(socket->waitForEncrypted(10000), works); + QFETCH_GLOBAL(bool, setProxy); + if (setProxy && (socket->waitForEncrypted(10000) != works)) + QSKIP("Skipping flaky test - See QTBUG-29941"); if (works) { socket->disconnectFromHost(); QVERIFY2(socket->waitForDisconnected(), qPrintable(socket->errorString())); @@ -2114,7 +2117,9 @@ void tst_QSslSocket::ignoreSslErrorsListWithSlot() QFETCH(int, expectedSslErrorSignalCount); bool expectEncryptionSuccess = (expectedSslErrorSignalCount == 0); - QCOMPARE(socket.waitForEncrypted(10000), expectEncryptionSuccess); + QFETCH_GLOBAL(bool, setProxy); + if (setProxy && (socket.waitForEncrypted(10000) != expectEncryptionSuccess)) + QSKIP("Skipping flaky test - See QTBUG-29941"); } // make sure a closed socket has no bytesAvailable() @@ -2205,7 +2210,8 @@ void tst_QSslSocket::blacklistedCertificates() QVERIFY(server.listen(QHostAddress::LocalHost)); receiver->connectToHost("127.0.0.1", server.serverPort()); QVERIFY(receiver->waitForConnected(5000)); - QVERIFY(server.waitForNewConnection(0)); + if (!server.waitForNewConnection(0)) + QSKIP("Skipping flaky test - See QTBUG-29941"); QSslSocket *sender = server.socket; QVERIFY(sender); @@ -2341,7 +2347,9 @@ void tst_QSslSocket::resume() socket.connectToHostEncrypted(QtNetworkSettings::serverName(), 993); QTestEventLoop::instance().enterLoop(10); - QVERIFY(!QTestEventLoop::instance().timeout()); + QFETCH_GLOBAL(bool, setProxy); + if (setProxy && QTestEventLoop::instance().timeout()) + QSKIP("Skipping flaky test - See QTBUG-29941"); QCOMPARE(sslErrorSpy.count(), 1); QCOMPARE(errorSpy.count(), 0); QCOMPARE(encryptedSpy.count(), 0); |