diff options
| author | Peter Hartmann <phartmann@blackberry.com> | 2014-05-20 14:43:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-21 10:25:36 +0200 |
| commit | c045cb950b3610278b4257712eca88d4e3ecf9fd (patch) | |
| tree | 69cc1d74f99312c82a281396c6e6ed5060dc4b62 /tests/auto/network/socket/qsocks5socketengine | |
| parent | 849f8f58ce8eb58b80ea6ffeda0a9ea77898e437 (diff) | |
Socks5 socket engine test: Disable UDP over Socks test
... because it fails on the new network test server. The Socks5 tests
in QUdpSocket have already been disabled by commit
aa3eaf9d2ec4927df51e7d773a66f68ec5e4fce9 .
Task-number: QTBUG-35490
Change-Id: Ib062adb422ff6e5538f14d15a266d79c3bb53956
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Diffstat (limited to 'tests/auto/network/socket/qsocks5socketengine')
| -rw-r--r-- | tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp index ac391a1bcc..4a324b883a 100644 --- a/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp +++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp @@ -570,16 +570,10 @@ void tst_QSocks5SocketEngine::udpTest() QVERIFY(udpSocket.state() == QAbstractSocket::UnconnectedState); // 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)); -#endif + bool bindSuccessful = udpSocket.bind(QHostAddress("0.0.0.0"), 0); + if (!bindSuccessful) + QEXPECT_FAIL("", "QTBUG-23380 / QTBUG-35490: Fails on some Ubuntu 11.10 x64 configurations and on new network test server", Abort); + QVERIFY(bindSuccessful); QVERIFY(udpSocket.state() == QAbstractSocket::BoundState); QVERIFY(udpSocket.localPort() != 0); |