diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 16:59:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 16:59:33 +0100 |
| commit | 3f3be55835427ea9f1bbcc046e05ee538ca214d7 (patch) | |
| tree | 09d1f54d114855c2b06cc505dfbf74c5890c8419 /tests/auto/network/socket/qudpsocket | |
| parent | ae293c1cb220847194fba6dcebdbb9194837bb56 (diff) | |
| parent | 9764f8602719676d1fa15e6fd1e7980af16bfc63 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/kernel/qplatformtheme.h
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
Change-Id: Iecd3343d6a050b8764f78d809c4a1532aeba69e5
Diffstat (limited to 'tests/auto/network/socket/qudpsocket')
| -rw-r--r-- | tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp index 776278a480..f3cae6f4eb 100644 --- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp @@ -48,6 +48,7 @@ #include <qudpsocket.h> #include <qhostaddress.h> #include <qhostinfo.h> +#include <qtcpsocket.h> #include <qmap.h> #include <QNetworkProxy> #include <QNetworkInterface> @@ -144,12 +145,26 @@ tst_QUdpSocket::~tst_QUdpSocket() void tst_QUdpSocket::initTestCase_data() { + // hack: we only enable the Socks5 over UDP tests on the old + // test server, because they fail on the new one. See QTBUG-35490 + bool newTestServer = true; + QTcpSocket socket; + socket.connectToHost(QtNetworkSettings::serverName(), 22); + if (socket.waitForConnected(10000)) { + socket.waitForReadyRead(5000); + QByteArray ba = socket.readAll(); + if (ba.startsWith("SSH-2.0-OpenSSH_5.8p1")) + newTestServer = false; + socket.disconnectFromHost(); + } + QTest::addColumn<bool>("setProxy"); QTest::addColumn<int>("proxyType"); QTest::newRow("WithoutProxy") << false << 0; #ifndef QT_NO_SOCKS5 - QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy); + if (!newTestServer) + QTest::newRow("WithSocks5Proxy") << true << int(QNetworkProxy::Socks5Proxy); #endif #ifndef QT_NO_BEARERMANAGEMENT |