diff options
Diffstat (limited to 'tests/auto/network')
12 files changed, 77 insertions, 97 deletions
diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp index d507c93cf5..614096df15 100644 --- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp +++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp @@ -341,7 +341,7 @@ void tst_QAbstractNetworkCache::check() void tst_QAbstractNetworkCache::checkSynchronous() { - QSKIP("not working yet, see QTBUG-15221", SkipAll); + QSKIP("not working yet, see QTBUG-15221"); QFETCH(QNetworkRequest::CacheLoadControl, cacheLoadControl); QFETCH(QString, url); diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp index d88ce676e2..87a4dbfc02 100644 --- a/tests/auto/network/access/qftp/tst_qftp.cpp +++ b/tests/auto/network/access/qftp/tst_qftp.cpp @@ -350,7 +350,7 @@ void tst_QFtp::connectToUnresponsiveHost() { QFETCH_GLOBAL(bool, setProxy); if (setProxy) - QSKIP( "This test takes too long if we test with proxies too", SkipSingle ); + QSKIP( "This test takes too long if we test with proxies too"); QString host = "192.0.2.42"; // IP out of TEST-NET, should be unreachable uint port = 21; @@ -759,9 +759,8 @@ void tst_QFtp::put() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 the put() test takes too long time on Windows.", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 the put() test takes too long time on Windows."); } #endif @@ -2075,7 +2074,7 @@ void tst_QFtp::doneSignal() void tst_QFtp::queueMoreCommandsInDoneSlot() { - QSKIP("Task 127050 && 113966", SkipSingle); + QSKIP("Task 127050 && 113966"); QFtp ftp; QSignalSpy doneSpy(&ftp, SIGNAL(done(bool))); diff --git a/tests/auto/network/access/qhttp/tst_qhttp.cpp b/tests/auto/network/access/qhttp/tst_qhttp.cpp index d73a191ebc..7150400c4f 100644 --- a/tests/auto/network/access/qhttp/tst_qhttp.cpp +++ b/tests/auto/network/access/qhttp/tst_qhttp.cpp @@ -1337,7 +1337,7 @@ void tst_QHttp::proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticato void tst_QHttp::postAuthNtlm() { - QSKIP("NTLM not working", SkipAll); + QSKIP("NTLM not working"); QHostInfo info = QHostInfo::fromName(QHostInfo::localHostName()); QByteArray postData("Hello World"); diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 4d4aca6517..2c6718153b 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -2254,7 +2254,7 @@ void tst_QNetworkReply::putToHttpMultipart_data() void tst_QNetworkReply::putToHttpMultipart() { - QSKIP("test server script cannot handle PUT data yet", SkipAll); + QSKIP("test server script cannot handle PUT data yet"); QFETCH(QUrl, url); static QSet<QByteArray> boundaries; @@ -3819,7 +3819,7 @@ void tst_QNetworkReply::ioPutToFileFromProcess() #ifdef Q_OS_WIN if (qstrcmp(QTest::currentDataTag(), "small") == 0) QSKIP("When passing a CR-LF-LF sequence through Windows stdio, it gets converted, " - "so this test fails. Disabled on Windows", SkipSingle); + "so this test fails. Disabled on Windows"); #endif QFile file(testFileName); @@ -4373,7 +4373,7 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp_data() void tst_QNetworkReply::ioGetFromBuiltinHttp() { - QSKIP("Limiting is broken right now, check QTBUG-15065", SkipAll); + QSKIP("Limiting is broken right now, check QTBUG-15065"); QFETCH(bool, https); QFETCH(int, bufferSize); @@ -4620,7 +4620,7 @@ void tst_QNetworkReply::rateControl_data() void tst_QNetworkReply::rateControl() { - QSKIP("Test disabled -- only for manual purposes", SkipAll); + QSKIP("Test disabled -- only for manual purposes"); // this function tests that we aren't reading from the network // faster than the data is being consumed. QFETCH(int, rate); diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp index 9ced5464a0..6b299ac459 100644 --- a/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp +++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp @@ -351,7 +351,7 @@ public: void tst_QNetworkConfigurationManager::usedInThread() { #if defined Q_OS_MAC && !defined (QT_NO_COREWLAN) - QSKIP("QTBUG-19070 Mac CoreWlan plugin is broken", SkipAll); + QSKIP("QTBUG-19070 Mac CoreWlan plugin is broken"); #else QNCMTestThread thread; connect(&thread, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp index 6d11fd5ccd..685c0ba696 100644 --- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp +++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp @@ -261,15 +261,12 @@ void tst_QNetworkSession::sessionClosing() // First check that opening once succeeds and determine if test is doable QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType); - if (!config.isValid()) { - QSKIP("No suitable configurations, skipping this round of repeated open-close test.", SkipSingle); - } + if (!config.isValid()) + QSKIP("No suitable configurations, skipping this round of repeated open-close test."); qDebug() << "Using following configuration to bomb with close(): " << config.name(); QNetworkSession session(config); - if (!openSession(&session) || - !closeSession(&session)) { - QSKIP("Unable to open/close session, skipping this round of close() bombing.", SkipSingle); - } + if (!openSession(&session) || !closeSession(&session)) + QSKIP("Unable to open/close session, skipping this round of close() bombing."); qDebug() << "Closing without issuing open()"; session.close(); @@ -442,15 +439,12 @@ void tst_QNetworkSession::repeatedOpenClose() // First check that opening once succeeds and determine if repeatable testing is doable QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType); - if (!config.isValid()) { - QSKIP("No suitable configurations, skipping this round of repeated open-close test.", SkipSingle); - } + if (!config.isValid()) + QSKIP("No suitable configurations, skipping this round of repeated open-close test."); qDebug() << "Using following configuratio to repeatedly open and close: " << config.name(); QNetworkSession permanentSession(config); - if (!openSession(&permanentSession) || - !closeSession(&permanentSession)) { - QSKIP("Unable to open/close session, skipping this round of repeated open-close test.", SkipSingle); - } + if (!openSession(&permanentSession) || !closeSession(&permanentSession)) + QSKIP("Unable to open/close session, skipping this round of repeated open-close test."); for (int i = 0; i < repeatTimes; i++) { qDebug() << "Opening, loop number " << i; QVERIFY(openSession(&permanentSession)); @@ -468,7 +462,7 @@ void tst_QNetworkSession::userChoiceSession_data() if (config.type() == QNetworkConfiguration::UserChoice) QTest::newRow("UserChoice") << config; else - QSKIP("Default configuration is not a UserChoice configuration.", SkipAll); + QSKIP("Default configuration is not a UserChoice configuration."); } void tst_QNetworkSession::userChoiceSession() @@ -489,7 +483,7 @@ void tst_QNetworkSession::userChoiceSession() // The remaining tests require the session to be not NotAvailable. if (session.state() == QNetworkSession::NotAvailable) - QSKIP("Network is not available.", SkipSingle); + QSKIP("Network is not available."); QSignalSpy sessionOpenedSpy(&session, SIGNAL(opened())); QSignalSpy sessionClosedSpy(&session, SIGNAL(closed())); @@ -511,7 +505,7 @@ void tst_QNetworkSession::userChoiceSession() if (error == QNetworkSession::OperationNotSupportedError) { // The session needed to bring up the interface, // but the operation is not supported. - QSKIP("Configuration does not support open().", SkipSingle); + QSKIP("Configuration does not support open()."); } else if (error == QNetworkSession::InvalidConfigurationError) { // The session needed to bring up the interface, but it is not possible for the // specified configuration. @@ -519,10 +513,10 @@ void tst_QNetworkSession::userChoiceSession() QNetworkConfiguration::Discovered) { QFAIL("Failed to open session for Discovered configuration."); } else { - QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle); + QSKIP("Cannot test session for non-Discovered configuration."); } } else if (error == QNetworkSession::UnknownSessionError) { - QSKIP("Unknown session error.", SkipSingle); + QSKIP("Unknown session error."); } else { QFAIL("Error opening session."); } @@ -619,7 +613,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() // The remaining tests require the session to be not NotAvailable. if (session.state() == QNetworkSession::NotAvailable) - QSKIP("Network is not available.", SkipSingle); + QSKIP("Network is not available."); QSignalSpy sessionOpenedSpy(&session, SIGNAL(opened())); QSignalSpy sessionClosedSpy(&session, SIGNAL(closed())); @@ -649,7 +643,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() if (error == QNetworkSession::OperationNotSupportedError) { // The session needed to bring up the interface, // but the operation is not supported. - QSKIP("Configuration does not support open().", SkipSingle); + QSKIP("Configuration does not support open()."); } else if (error == QNetworkSession::InvalidConfigurationError) { // The session needed to bring up the interface, but it is not possible for the // specified configuration. @@ -657,10 +651,10 @@ void tst_QNetworkSession::sessionOpenCloseStop() QNetworkConfiguration::Discovered) { QFAIL("Failed to open session for Discovered configuration."); } else { - QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle); + QSKIP("Cannot test session for non-Discovered configuration."); } } else if (error == QNetworkSession::UnknownSessionError) { - QSKIP("Unknown Session error.", SkipSingle); + QSKIP("Unknown Session error."); } else { QFAIL("Error opening session."); } @@ -779,7 +773,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() if (error == QNetworkSession::OperationNotSupportedError) { // The session needed to bring down the interface, // but the operation is not supported. - QSKIP("Configuration does not support stop().", SkipSingle); + QSKIP("Configuration does not support stop()."); } else if (error == QNetworkSession::InvalidConfigurationError) { // The session needed to bring down the interface, but it is not possible for the // specified configuration. @@ -787,7 +781,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() QNetworkConfiguration::Discovered) { QFAIL("Failed to stop session for Discovered configuration."); } else { - QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle); + QSKIP("Cannot test session for non-Discovered configuration."); } } else { QFAIL("Error stopping session."); @@ -958,7 +952,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() if (error == QNetworkSession::OperationNotSupportedError) { // The session needed to bring down the interface, // but the operation is not supported. - QSKIP("Configuration does not support close().", SkipSingle); + QSKIP("Configuration does not support close()."); } else if (error == QNetworkSession::InvalidConfigurationError) { // The session needed to bring down the interface, but it is not possible for the // specified configuration. @@ -966,7 +960,7 @@ void tst_QNetworkSession::sessionOpenCloseStop() QNetworkConfiguration::Discovered) { QFAIL("Failed to close session for Discovered configuration."); } else { - QSKIP("Cannot test session for non-Discovered configuration.", SkipSingle); + QSKIP("Cannot test session for non-Discovered configuration."); } } else { QFAIL("Error closing session."); @@ -1090,11 +1084,11 @@ void tst_QNetworkSession::outOfProcessSession() qDebug("Lackey returned exit success (0)"); break; case 1: - QSKIP("No discovered configurations found.", SkipAll); + QSKIP("No discovered configurations found."); case 2: - QSKIP("Lackey could not start session.", SkipAll); + QSKIP("Lackey could not start session."); default: - QSKIP("Lackey failed", SkipAll); + QSKIP("Lackey failed"); } } @@ -1319,7 +1313,7 @@ void tst_QNetworkSession::sessionAutoClose_data() } if (!testData) - QSKIP("No applicable configurations to test", SkipAll); + QSKIP("No applicable configurations to test"); } void tst_QNetworkSession::sessionAutoClose() @@ -1343,7 +1337,7 @@ void tst_QNetworkSession::sessionAutoClose() session.waitForOpened(); if (!session.isOpen()) - QSKIP("Session not open", SkipSingle); + QSKIP("Session not open"); // set session to auto close at next polling interval. session.setSessionProperty(QLatin1String("AutoCloseSessionTimeout"), 0); diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp index 3e0437f3c8..e9acf686f0 100644 --- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp @@ -328,7 +328,7 @@ void tst_QHostInfo::lookupIPv6() QFETCH(QString, addresses); if (!ipv6LookupsAvailable) - QSKIP("This platform does not support IPv6 lookups", SkipAll); + QSKIP("This platform does not support IPv6 lookups"); lookupDone = false; QHostInfo::lookupHost(hostname, this, SLOT(resultsReady(const QHostInfo&))); @@ -371,11 +371,11 @@ void tst_QHostInfo::reverseLookup() QFETCH(int, err); if (!ipv6LookupsAvailable && hostNames.contains("classical.hexago.com")) { - QSKIP("IPv6 lookups are not supported on this platform", SkipSingle); + QSKIP("IPv6 lookups are not supported on this platform"); } #if defined(Q_OS_HPUX) && defined(__ia64) if (hostNames.contains("classical.hexago.com")) - QSKIP("HP-UX 11i does not support IPv6 reverse lookups.", SkipSingle); + QSKIP("HP-UX 11i does not support IPv6 reverse lookups."); #endif QHostInfo info = QHostInfo::fromName(address); diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp index 0540bc8408..de06a54447 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -226,7 +226,7 @@ void tst_QNetworkProxyFactory::inNetworkAccessManager() if (count == factory->requestCounter) { //RND phones are preconfigured with several test access points which won't work without a matching SIM //If the network fails to start, QNAM won't ask the factory for proxies so we can't test. - QSKIP("network configuration didn't start", SkipSingle); + QSKIP("network configuration didn't start"); } qDebug() << "testing network configuration for" << config.name(); 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()); diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 95ab719405..46f8111945 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -1040,7 +1040,7 @@ void tst_QTcpSocket::disconnectWhileConnecting() if (!data.isEmpty()) socket->write(data); if (socket->state() == QAbstractSocket::ConnectedState) - QSKIP("localhost connections are immediate, test case is invalid", SkipSingle); + QSKIP("localhost connections are immediate, test case is invalid"); QFETCH(bool, closeDirectly); if (closeDirectly) { @@ -1156,9 +1156,8 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop() socket->connectToHost("127.0.0.1", thread->serverPort); if (!data.isEmpty()) socket->write(data); - if (socket->state() == QAbstractSocket::ConnectedState) { - QSKIP("localhost connections are immediate, test case is invalid", SkipSingle); - } + if (socket->state() == QAbstractSocket::ConnectedState) + QSKIP("localhost connections are immediate, test case is invalid"); QFETCH(bool, closeDirectly); if (closeDirectly) { @@ -2224,14 +2223,14 @@ void tst_QTcpSocket::suddenRemoteDisconnect() #ifndef Q_OS_VXWORKS void tst_QTcpSocket::connectToMultiIP() { - QSKIP("TODO: setup DNS in the new network", SkipAll); + QSKIP("TODO: setup DNS in the new network"); QFETCH_GLOBAL(bool, ssl); if (ssl) return; QFETCH_GLOBAL(bool, setProxy); if (setProxy) - QSKIP("This test takes too long if we also add the proxies.", SkipSingle); + QSKIP("This test takes too long if we also add the proxies."); qDebug("Please wait, this test can take a while..."); diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp index b2cbe11796..a44d724d63 100644 --- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp @@ -246,9 +246,8 @@ void tst_QUdpSocket::broadcasting() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 Broadcast is not supported.", SkipSingle); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 Broadcast is not supported."); } const char *message[] = {"Yo mista", "", "Yo", "Wassap"}; @@ -261,7 +260,7 @@ void tst_QUdpSocket::broadcasting() } } if (broadcastAddresses.isEmpty()) - QSKIP("No interface can broadcast", SkipAll); + QSKIP("No interface can broadcast"); for (int i = 0; i < 4; ++i) { QUdpSocket serverSocket; #ifdef FORCE_SESSION @@ -432,7 +431,7 @@ void tst_QUdpSocket::dualStack() { QFETCH_GLOBAL(bool, setProxy); if (setProxy) - QSKIP("test server SOCKS proxy doesn't support IPv6", SkipSingle); + QSKIP("test server SOCKS proxy doesn't support IPv6"); QUdpSocket dualSock; QByteArray dualData("dual"); QVERIFY(dualSock.bind(QHostAddress(QHostAddress::Any), 0)); @@ -545,26 +544,23 @@ void tst_QUdpSocket::pendingDatagramSize() QCOMPARE(server.readDatagram(&c, 1), qint64(1)); QCOMPARE(c, 't'); c = '\0'; - } else { - QSKIP("does not have the 1st datagram", SkipSingle); - } + } else + QSKIP("does not have the 1st datagram"); if (server.hasPendingDatagrams()) { QCOMPARE(server.pendingDatagramSize(), qint64(0)); QCOMPARE(server.readDatagram(&c, 1), qint64(0)); QCOMPARE(c, '\0'); // untouched - c = '\0'; - } else { - QSKIP("does not have the 2nd datagram", SkipSingle); - } + c = '\0'; + } else + QSKIP("does not have the 2nd datagram"); if (server.hasPendingDatagrams()) { QCOMPARE(server.pendingDatagramSize(), qint64(10)); QCOMPARE(server.readDatagram(&c, 1), qint64(1)); QCOMPARE(c, '3'); - } else { - QSKIP("does not have the 3rd datagram", SkipSingle); - } + } else + QSKIP("does not have the 3rd datagram"); } @@ -597,7 +593,7 @@ void tst_QUdpSocket::writeDatagram() if (written != i * 1024) { #if defined (Q_OS_HPUX) - QSKIP("HP-UX 11.11 on hai (PA-RISC 64) truncates too long datagrams.", SkipSingle); + QSKIP("HP-UX 11.11 on hai (PA-RISC 64) truncates too long datagrams."); #endif QCOMPARE(bytesspy.count(), 0); QCOMPARE(errorspy.count(), 1); @@ -610,9 +606,8 @@ void tst_QUdpSocket::writeDatagram() QCOMPARE(*static_cast<const qint64 *>(bytesspy.at(0).at(0).constData()), qint64(i * 1024)); QCOMPARE(errorspy.count(), 0); - if (!server.waitForReadyRead(5000)) { - QSKIP(QString("UDP packet lost at size %1, unable to complete the test.").arg(i * 1024).toLatin1().data(), SkipSingle); - } + if (!server.waitForReadyRead(5000)) + QSKIP(QString("UDP packet lost at size %1, unable to complete the test.").arg(i * 1024).toLatin1().data()); QCOMPARE(server.pendingDatagramSize(), qint64(i * 1024)); QCOMPARE(server.readDatagram(0, 0), qint64(0)); } @@ -663,9 +658,8 @@ void tst_QUdpSocket::bindMode() QFETCH_GLOBAL(bool, setProxy); if (setProxy) { QFETCH_GLOBAL(int, proxyType); - if (proxyType == QNetworkProxy::Socks5Proxy) { - QSKIP("With socks5 explicit port binding is not supported.", SkipAll); - } + if (proxyType == QNetworkProxy::Socks5Proxy) + QSKIP("With socks5 explicit port binding is not supported."); } QUdpSocket socket; @@ -745,7 +739,7 @@ void tst_QUdpSocket::writeToNonExistingPeer_data() void tst_QUdpSocket::writeToNonExistingPeer() { - QSKIP("Connected-mode UDP sockets and their behaviour are erratic", SkipAll); + QSKIP("Connected-mode UDP sockets and their behaviour are erratic"); QFETCH(QHostAddress, peerAddress); quint16 peerPort = 34534; qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError"); @@ -1058,9 +1052,8 @@ void tst_QUdpSocket::multicastLeaveAfterClose() { QFETCH_GLOBAL(bool, setProxy); QFETCH(QHostAddress, groupAddress); - if (setProxy) { - QSKIP("UDP Multicast does not work with proxies", SkipAll); - } + if (setProxy) + QSKIP("UDP Multicast does not work with proxies"); QUdpSocket udpSocket; #ifdef FORCE_SESSION diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index eaf9cb3347..0509c2f489 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -1269,7 +1269,7 @@ void tst_QSslSocket::wildcardCertificateNames() void tst_QSslSocket::wildcard() { - QSKIP("TODO: solve wildcard problem", SkipAll); + QSKIP("TODO: solve wildcard problem"); if (!QSslSocket::supportsSsl()) return; |