summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qtcpsocket/tst_qtcpsocket.cpp3
-rw-r--r--tests/auto/qudpsocket/tst_qudpsocket.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index 5ee615b995..9bbb344298 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -81,7 +81,7 @@
#include <QTimer>
#include <QDebug>
#ifndef TEST_QNETWORK_PROXY
-//#define TEST_QNETWORK_PROXY
+#define TEST_QNETWORK_PROXY
#endif
// RVCT compiles also unused inline methods
# include <QNetworkProxy>
@@ -2231,7 +2231,6 @@ void tst_QTcpSocket::invalidProxy_data()
<< "this-host-will-never-exist.troll.no" << 3128 << false
<< int(QAbstractSocket::ProxyNotFoundError);
#if !defined(Q_OS_SYMBIAN)
- //QSKIP("On Symbian Emulator not clear what to expect + server settings", SkipAll);
QTest::newRow("http-on-socks5") << int(QNetworkProxy::HttpProxy) << fluke << 1080 << false
<< int(QAbstractSocket::ProxyConnectionClosedError);
QTest::newRow("socks5-on-http") << int(QNetworkProxy::Socks5Proxy) << fluke << 3128 << false
diff --git a/tests/auto/qudpsocket/tst_qudpsocket.cpp b/tests/auto/qudpsocket/tst_qudpsocket.cpp
index 0ae2521738..8d09924b24 100644
--- a/tests/auto/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/qudpsocket/tst_qudpsocket.cpp
@@ -552,8 +552,6 @@ void tst_QUdpSocket::bindMode()
QUdpSocket socket2;
QVERIFY(!socket2.bind(socket.localPort()));
#if defined(Q_OS_SYMBIAN)
-
- //RPRocess me;
if(RProcess().HasCapability(ECapabilityNetworkControl)) {
qDebug("Test executed *with* NetworkControl capability");
// In Symbian OS ReuseAddressHint together with NetworkControl capability