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

Revert "tst_qsslsocket::protocolServeSide - fix for macOS 10.11"

Browse Source 
The fix is outdated - the tests it was fixing - pass on 10.11.

Change-Id: I8b42c1d3d2f1279382b15c20587dcc93cf1b6b40
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Timur Pocheptsov 2017-03-31 11:45:41 +00:00
parent 8e6a17f687
commit 5218a80bd1
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <QtCore/qthread.h> #include <QtCore/qthread.h>
#include <QtCore/qoperatingsystemversion.h>
#include <QtNetwork/qhostaddress.h> #include <QtNetwork/qhostaddress.h>
#include <QtNetwork/qhostinfo.h> #include <QtNetwork/qhostinfo.h>
#include <QtNetwork/qnetworkproxy.h> #include <QtNetwork/qnetworkproxy.h>
@ -1167,19 +1166,6 @@ void tst_QSslSocket::protocolServerSide_data()
QTest::addColumn<QSsl::SslProtocol>("clientProtocol"); QTest::addColumn<QSsl::SslProtocol>("clientProtocol");
QTest::addColumn<bool>("works"); QTest::addColumn<bool>("works");
// On macOS 10.11 with SecureTransport backend some tests are failing for no
// obvious reason (so no bug in our code): QTBUG-48860 - an error can be
// errSSLInternal or cipher negotiation failure. This problem does not exist
// on macOS before 10.11 and after 10.11, so we adjust these tests only for 10.11.
#if defined(QT_SECURETRANSPORT)
using OSVersion = QOperatingSystemVersion;
const bool testWorks = OSVersion::current() < OSVersion::OSXElCapitan
|| OSVersion::current() > OSVersion::OSXElCapitan;
#else
const bool testWorks = true;
#endif
#if !defined(OPENSSL_NO_SSL2) && !defined(QT_SECURETRANSPORT) #if !defined(OPENSSL_NO_SSL2) && !defined(QT_SECURETRANSPORT)
QTest::newRow("ssl2-ssl2") << QSsl::SslV2 << QSsl::SslV2 << false; // no idea why it does not work, but we don't care about SSL 2 QTest::newRow("ssl2-ssl2") << QSsl::SslV2 << QSsl::SslV2 << false; // no idea why it does not work, but we don't care about SSL 2
#endif #endif
@ -1204,14 +1190,14 @@ void tst_QSslSocket::protocolServerSide_data()
#endif #endif
#if !defined(OPENSSL_NO_SSL3) #if !defined(OPENSSL_NO_SSL3)
QTest::newRow("ssl3-tls1.0") << QSsl::SslV3 << QSsl::TlsV1_0 << false; QTest::newRow("ssl3-tls1.0") << QSsl::SslV3 << QSsl::TlsV1_0 << false;
QTest::newRow("ssl3-tls1ssl3") << QSsl::SslV3 << QSsl::TlsV1SslV3 << testWorks; QTest::newRow("ssl3-tls1ssl3") << QSsl::SslV3 << QSsl::TlsV1SslV3 << true;
QTest::newRow("ssl3-secure") << QSsl::SslV3 << QSsl::SecureProtocols << false; QTest::newRow("ssl3-secure") << QSsl::SslV3 << QSsl::SecureProtocols << false;
#endif #endif
#if !defined(OPENSSL_NO_SSL2) && !defined(QT_SECURETRANSPORT) && !defined(OPENSSL_NO_SSL3) #if !defined(OPENSSL_NO_SSL2) && !defined(QT_SECURETRANSPORT) && !defined(OPENSSL_NO_SSL3)
QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << false; // we won't set a SNI header here because we connect to a QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << false; // we won't set a SNI header here because we connect to a
// numerical IP, so OpenSSL will send a SSL 2 handshake // numerical IP, so OpenSSL will send a SSL 2 handshake
#elif !defined(OPENSSL_NO_SSL3) #elif !defined(OPENSSL_NO_SSL3)
QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << testWorks; QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << true;
#endif #endif
#if !defined(OPENSSL_NO_SSL2) && !defined(QT_SECURETRANSPORT) #if !defined(OPENSSL_NO_SSL2) && !defined(QT_SECURETRANSPORT)