tst_qtcpsocket - skip proxies for localhost testing

There is no point to test the proxy setting for connections to localhost,
because the proxy is bypassed anyway.
Skipping running the same test case multiple times makes this test complete
a bit faster.

Reviewed-by: Markus Goetz

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index b21de49..b972130 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -981,6 +981,9 @@ void tst_QTcpSocket::disconnectWhileConnecting_data()
 void tst_QTcpSocket::disconnectWhileConnecting()
 {
     QFETCH(QByteArray, data);
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy)
+        return; //proxy not useful for localhost test case
 
     QTcpServer server;
     QVERIFY(server.listen(QHostAddress::LocalHost));
@@ -1106,6 +1109,9 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop_data()
 void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop()
 {
     QFETCH(QByteArray, data);
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy)
+        return; //proxy not useful for localhost test case
 
     QScopedPointer<ReceiverThread, ReceiverThread> thread (new ReceiverThread);
     QVERIFY(thread->listen());
@@ -1646,6 +1652,9 @@ private slots:
 //----------------------------------------------------------------------------------
 void tst_QTcpSocket::remoteCloseError()
 {
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy)
+        return; //proxy not useful for localhost test case
     RemoteCloseErrorServer server;
     QVERIFY(server.listen(QHostAddress::LocalHost));
 
@@ -1956,6 +1965,9 @@ void tst_QTcpSocket::linuxKernelBugLocalSocket()
 //----------------------------------------------------------------------------------
 void tst_QTcpSocket::abortiveClose()
 {
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy)
+        return; //proxy not useful for localhost test case
     QTcpServer server;
     QVERIFY(server.listen(QHostAddress::LocalHost));
     connect(&server, SIGNAL(newConnection()), this, SLOT(exitLoopSlot()));
@@ -1994,6 +2006,9 @@ void tst_QTcpSocket::abortiveClose_abortSlot()
 //----------------------------------------------------------------------------------
 void tst_QTcpSocket::localAddressEmptyOnBSD()
 {
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy)
+        return; //proxy not useful for localhost test case
     QTcpServer server;
     QVERIFY(server.listen(QHostAddress::LocalHost));
 
@@ -2264,6 +2279,9 @@ void tst_QTcpSocket::moveToThread0()
 
 void tst_QTcpSocket::increaseReadBufferSize()
 {
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy)
+        return; //proxy not useful for localhost test case
     QTcpServer server;
     QTcpSocket *active = newSocket();
     connect(active, SIGNAL(readyRead()), SLOT(exitLoopSlot()));