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

SSL Socket withoutproxy failures on Ubuntu 11.10 x64.

Browse Source 
Numerous failures in the qsslsocket autotest suite relating to
connections without using proxies. Some have been skipped due to
the number of failures, other more specific tests have been set
to expect a failure.

Task-number: QTBUG-23575

Change-Id: I35fccc65bcab303646617a57a33f5aa7f7a4323f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Toby Tomkins 2012-01-12 11:38:55 +10:00 committed by Qt by Nokia
parent c2a663dac3
commit 605329eb1b
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,4 +32,7 @@ wince* {
DEFINES += SRCDIR=\\\"$$PWD/\\\" DEFINES += SRCDIR=\\\"$$PWD/\\\"
} }
# QTBUG-23575
linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))

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

@ -947,6 +947,9 @@ protected slots:
void tst_QSslSocket::protocolServerSide_data() void tst_QSslSocket::protocolServerSide_data()
{ {
#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
QSKIP("Fails on this platform - QTBUG-23575");
#endif
QTest::addColumn<QSsl::SslProtocol>("serverProtocol"); QTest::addColumn<QSsl::SslProtocol>("serverProtocol");
QTest::addColumn<QSsl::SslProtocol>("clientProtocol"); QTest::addColumn<QSsl::SslProtocol>("clientProtocol");
@ -1096,6 +1099,9 @@ void tst_QSslSocket::setSocketDescriptor()
loop.exec(); loop.exec();
QCOMPARE(client->state(), QAbstractSocket::ConnectedState); QCOMPARE(client->state(), QAbstractSocket::ConnectedState);
#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
QEXPECT_FAIL("", "QTBUG-23575 - Fails on this platform", Abort);
#endif
QVERIFY(client->isEncrypted()); QVERIFY(client->isEncrypted());
QVERIFY(!client->peerAddress().isNull()); QVERIFY(!client->peerAddress().isNull());
QVERIFY(client->peerPort() != 0); QVERIFY(client->peerPort() != 0);
@ -1381,6 +1387,9 @@ void tst_QSslSocket::spontaneousWrite()
QVERIFY(server.waitForNewConnection(0)); QVERIFY(server.waitForNewConnection(0));
QSslSocket *sender = server.socket; QSslSocket *sender = server.socket;
#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
QEXPECT_FAIL("", "QTBUG-23575 - Fails on this platform", Abort);
#endif
QVERIFY(sender); QVERIFY(sender);
QVERIFY(sender->state() == QAbstractSocket::ConnectedState); QVERIFY(sender->state() == QAbstractSocket::ConnectedState);
receiver->setObjectName("receiver"); receiver->setObjectName("receiver");
@ -1426,6 +1435,9 @@ void tst_QSslSocket::setReadBufferSize()
QVERIFY(server.waitForNewConnection(0)); QVERIFY(server.waitForNewConnection(0));
QSslSocket *sender = server.socket; QSslSocket *sender = server.socket;
#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
QEXPECT_FAIL("", "QTBUG-23575 - Fails on this platform", Abort);
#endif
QVERIFY(sender); QVERIFY(sender);
QVERIFY(sender->state() == QAbstractSocket::ConnectedState); QVERIFY(sender->state() == QAbstractSocket::ConnectedState);
receiver->setObjectName("receiver"); receiver->setObjectName("receiver");
@ -1680,6 +1692,9 @@ void tst_QSslSocket::waitForMinusOne()
// first verification: this waiting should take 200 ms // first verification: this waiting should take 200 ms
QVERIFY2(socket.waitForEncrypted(-1), qPrintable(socket.errorString())); QVERIFY2(socket.waitForEncrypted(-1), qPrintable(socket.errorString()));
#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
QEXPECT_FAIL("", "QTBUG-23575 - Fails on this platform", Abort);
#endif
QVERIFY(socket.isEncrypted()); QVERIFY(socket.isEncrypted());
QCOMPARE(socket.state(), QAbstractSocket::ConnectedState); QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
QCOMPARE(socket.bytesAvailable(), Q_INT64_C(0)); QCOMPARE(socket.bytesAvailable(), Q_INT64_C(0));
@ -1760,6 +1775,9 @@ void tst_QSslSocket::verifyMode()
connect(&clientSocket, SIGNAL(encrypted()), &loop, SLOT(quit())); connect(&clientSocket, SIGNAL(encrypted()), &loop, SLOT(quit()));
loop.exec(); loop.exec();
#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
QEXPECT_FAIL("", "QTBUG-23575 - Fails on this platform", Abort);
#endif
QVERIFY(clientSocket.isEncrypted()); QVERIFY(clientSocket.isEncrypted());
QVERIFY(server.socket->sslErrors().isEmpty()); QVERIFY(server.socket->sslErrors().isEmpty());
} }
@ -2037,6 +2055,9 @@ void tst_QSslSocket::blacklistedCertificates()
QVERIFY(server.waitForNewConnection(0)); QVERIFY(server.waitForNewConnection(0));
QSslSocket *sender = server.socket; QSslSocket *sender = server.socket;
#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
QEXPECT_FAIL("", "QTBUG-23575 - Fails on this platform", Abort);
#endif
QVERIFY(sender); QVERIFY(sender);
QVERIFY(sender->state() == QAbstractSocket::ConnectedState); QVERIFY(sender->state() == QAbstractSocket::ConnectedState);
receiver->setObjectName("receiver"); receiver->setObjectName("receiver");