AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove insignification of qsslsocket test on Windows and Mac.

Browse Source 
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>
This commit is contained in:
Jason McDonald 2012-04-27 18:41:05 +10:00 committed by Qt by Nokia
parent 7b87469bc5
commit 3019c9da1a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/auto/network/ssl/qsslsocket/qsslsocket.pro
View File

@ -31,9 +31,6 @@ wince* {
DEFINES += SRCDIR=\\\"$$PWD/\\\" DEFINES += SRCDIR=\\\"$$PWD/\\\"
} }
# QTBUG-23575 linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC # QTBUG-24234
linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))
win32|mac:CONFIG += insignificant_test # QTBUG-24234

4
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
View File

@ -1766,8 +1766,8 @@ void tst_QSslSocket::verifyMode()
loop.exec(); loop.exec();
QVERIFY(clientSocket.isEncrypted()); QVERIFY(clientSocket.isEncrypted());
#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__) #if (defined(UBUNTU_ONEIRIC) && defined(__x86_64__)) || defined(Q_OS_WIN) || defined(Q_OS_MAC)
QEXPECT_FAIL("", "QTBUG-23575 - Fails on this platform", Abort); QEXPECT_FAIL("", "QTBUG-24234", Abort);
#endif #endif
QVERIFY(server.socket->sslErrors().isEmpty()); QVERIFY(server.socket->sslErrors().isEmpty());
} }