diff options
Diffstat (limited to 'tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp')
-rw-r--r-- | tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index d982666931..f96ad2781e 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -283,7 +283,7 @@ void tst_QTcpServer::dualStack() { QFETCH_GLOBAL(bool, setProxy); if (setProxy) - QSKIP("test server proxy doesn't support ipv6", SkipSingle); + QSKIP("test server proxy doesn't support ipv6"); QFETCH(QHostAddress, bindAddress); QFETCH(bool, v4ok); QFETCH(bool, v6ok); @@ -349,9 +349,8 @@ void tst_QTcpServer::maxPendingConnections() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 only 1 connection is allowed ever", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 only 1 connection is allowed ever"); } //### sees to fail sometimes ... a timing issue with the test on windows QTcpServer server; @@ -388,9 +387,8 @@ void tst_QTcpServer::listenError() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 we can not make hard requirements on the address or port", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 we can not make hard requirements on the address or port"); } QTcpServer server; QVERIFY(!server.listen(QHostAddress("1.2.3.4"), 0)); @@ -435,9 +433,8 @@ void tst_QTcpServer::waitForConnectionTest() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("Localhost servers don't work well with SOCKS5", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("Localhost servers don't work well with SOCKS5"); } QTcpSocket findLocalIpSocket; @@ -533,9 +530,8 @@ void tst_QTcpServer::addressReusable() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 this test does not make senans at the momment", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 this test does not make senans at the momment"); } #if defined(Q_OS_WINCE) QString signalName = QString::fromLatin1("/test_signal.txt"); @@ -574,9 +570,8 @@ void tst_QTcpServer::setNewSocketDescriptorBlocking() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 we can not make the socket descripter blocking", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 we can not make the socket descripter blocking"); } SeverWithBlockingSockets server; QVERIFY(server.listen()); |