diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-27 18:41:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-30 01:07:50 +0200 |
| commit | 3019c9da1a82087c1c0ea4bea82bcfa7abe30ef8 (patch) | |
| tree | 64ef5e85dc64faeb3583c481ae30a3e840d501a6 /tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | |
| parent | 7b87469bc56b2bd44938e64611281e8e823a5841 (diff) | |
Remove insignification of qsslsocket test on Windows and Mac.
The test has a single stable failure on both of these platforms. Mark
the failure with QEXPECT_FAIL (that was already the case on Ubuntu
11.10) and re-enable the test.
Note also the elimination of duplicate bug numbers.
Task-number: QTBUG-24234
Change-Id: Ica11e7d1f3cd9487647127984fef7c75e0e764fe
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp')
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 333102030a..6f81829e25 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -1766,8 +1766,8 @@ void tst_QSslSocket::verifyMode() loop.exec(); QVERIFY(clientSocket.isEncrypted()); -#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__) - QEXPECT_FAIL("", "QTBUG-23575 - Fails on this platform", Abort); +#if (defined(UBUNTU_ONEIRIC) && defined(__x86_64__)) || defined(Q_OS_WIN) || defined(Q_OS_MAC) + QEXPECT_FAIL("", "QTBUG-24234", Abort); #endif QVERIFY(server.socket->sslErrors().isEmpty()); } |