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

Remove insignification of qsocks5socketengine on Ubuntu 11.10

Browse Source 
The test has one stable failure on CI, but that failure is not observed
by all Ubuntu 11.10 users. Mark that failure with QEXPECT_FAIL when it
is going to fail and re-enable the test, following the pattern
established for the qtcpsocket test on this platform.

Task-number: QTBUG-23380
Change-Id: Ic7546595f314c55ebd36957ada92978141a1c509
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
This commit is contained in:
Jason McDonald 2012-04-18 18:06:59 +10:00 committed by Qt by Nokia
parent 7f533cdd4a
commit 7d422688c2
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
View File

@ -10,6 +10,6 @@ MOC_DIR=tmp
QT = core-private network-private testlib QT = core-private network-private testlib
linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG += insignificant_test # QTBUG-23380 linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC # QTBUG-23380
requires(contains(QT_CONFIG,private_tests)) requires(contains(QT_CONFIG,private_tests))

9
tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
View File

@ -551,7 +551,16 @@ void tst_QSocks5SocketEngine::udpTest()
QVERIFY(udpSocket.state() == QAbstractSocket::UnconnectedState); QVERIFY(udpSocket.state() == QAbstractSocket::UnconnectedState);
// Bind #1 // Bind #1
#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
{
bool bindSuccessful = udpSocket.bind(QHostAddress("0.0.0.0"), 0);
if (!bindSuccessful)
QEXPECT_FAIL("", "QTBUG-23380: Fails on some Ubuntu 11.10 x64 configurations", Abort);
QVERIFY(bindSuccessful);
}
#else
QVERIFY(udpSocket.bind(QHostAddress("0.0.0.0"), 0)); QVERIFY(udpSocket.bind(QHostAddress("0.0.0.0"), 0));
#endif
QVERIFY(udpSocket.state() == QAbstractSocket::BoundState); QVERIFY(udpSocket.state() == QAbstractSocket::BoundState);
QVERIFY(udpSocket.localPort() != 0); QVERIFY(udpSocket.localPort() != 0);