diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /tests/auto/network | |
parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'tests/auto/network')
-rw-r--r-- | tests/auto/network/access/http2/http2srv.cpp | 10 | ||||
-rw-r--r-- | tests/auto/network/access/http2/http2srv.h | 12 | ||||
-rw-r--r-- | tests/auto/network/access/http2/tst_http2.cpp | 154 | ||||
-rw-r--r-- | tests/auto/network/access/qabstractnetworkcache/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/network/access/qftp/BLACKLIST | 9 | ||||
-rw-r--r-- | tests/auto/network/access/qnetworkreply/BLACKLIST | 191 | ||||
-rw-r--r-- | tests/auto/network/access/spdy/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/network/kernel/qdnslookup/BLACKLIST | 12 | ||||
-rw-r--r-- | tests/auto/network/socket/qsocks5socketengine/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/network/socket/qtcpserver/BLACKLIST | 14 | ||||
-rw-r--r-- | tests/auto/network/socket/qtcpsocket/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/network/socket/qudpsocket/BLACKLIST | 6 | ||||
-rw-r--r-- | tests/auto/network/ssl/qsslkey/BLACKLIST | 17 | ||||
-rw-r--r-- | tests/auto/network/ssl/qsslsocket/BLACKLIST | 4 |
14 files changed, 188 insertions, 252 deletions
diff --git a/tests/auto/network/access/http2/http2srv.cpp b/tests/auto/network/access/http2/http2srv.cpp index 5a99d4e50c..a8eebf5a24 100644 --- a/tests/auto/network/access/http2/http2srv.cpp +++ b/tests/auto/network/access/http2/http2srv.cpp @@ -76,7 +76,7 @@ void fill_push_header(const HttpHeader &originalRequest, HttpHeader &promisedReq } -Http2Server::Http2Server(H2Type type, const Http2::RawSettings &ss, const Http2::RawSettings &cs) +Http2Server::Http2Server(H2Type type, const RawSettings &ss, const RawSettings &cs) : connectionType(type), serverSettings(ss), expectedClientSettings(cs) @@ -218,7 +218,7 @@ void Http2Server::sendDATA(quint32 streamID, quint32 windowSize) quint32 bytesToSend = std::min<quint32>(windowSize, responseBody.size() - offset); quint32 bytesSent = 0; - const quint32 frameSizeLimit(clientSetting(Settings::MAX_FRAME_SIZE_ID, Http2::maxFrameSize)); + const quint32 frameSizeLimit(clientSetting(Settings::MAX_FRAME_SIZE_ID, Http2::minPayloadLimit)); const uchar *src = reinterpret_cast<const uchar *>(responseBody.constData() + offset); const bool last = offset + bytesToSend == quint32(responseBody.size()); @@ -236,6 +236,10 @@ void Http2Server::sendDATA(quint32 streamID, quint32 windowSize) src += chunkSize; bytesToSend -= chunkSize; bytesSent += chunkSize; + if (frameSizeLimit != Http2::minPayloadLimit) { + // Our test is probably interested in how many DATA frames were sent. + emit sendingData(); + } } if (interrupted.loadAcquire()) @@ -767,7 +771,7 @@ void Http2Server::sendResponse(quint32 streamID, bool emptyBody) Q_ASSERT(activeRequests.find(streamID) != activeRequests.end()); const quint32 maxFrameSize(clientSetting(Settings::MAX_FRAME_SIZE_ID, - Http2::maxFrameSize)); + Http2::maxPayloadSize)); if (pushPromiseEnabled) { // A real server supporting PUSH_PROMISE will probably first send diff --git a/tests/auto/network/access/http2/http2srv.h b/tests/auto/network/access/http2/http2srv.h index 4ef4b25101..3105684d59 100644 --- a/tests/auto/network/access/http2/http2srv.h +++ b/tests/auto/network/access/http2/http2srv.h @@ -42,6 +42,7 @@ #include <QtCore/qbytearray.h> #include <QtCore/qatomic.h> #include <QtCore/qglobal.h> +#include <QtCore/qmap.h> #include <vector> #include <map> @@ -69,13 +70,15 @@ enum class H2Type { h2cDirect, // Clear text direct }; +using RawSettings = QMap<Http2::Settings, quint32>; + class Http2Server : public QTcpServer { Q_OBJECT public: - Http2Server(H2Type type, const Http2::RawSettings &serverSettings, - const Http2::RawSettings &clientSettings); + Http2Server(H2Type type, const RawSettings &serverSettings, + const RawSettings &clientSettings); ~Http2Server(); @@ -125,6 +128,7 @@ Q_SIGNALS: void receivedRequest(quint32 streamID); void receivedData(quint32 streamID); void windowUpdate(quint32 streamID); + void sendingData(); private slots: void connectionEstablished(); @@ -147,8 +151,8 @@ private: bool settingsSent = false; bool waitingClientAck = false; - Http2::RawSettings serverSettings; - Http2::RawSettings expectedClientSettings; + RawSettings serverSettings; + RawSettings expectedClientSettings; bool connectionError = false; diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp index bf3d936446..e24a06bc34 100644 --- a/tests/auto/network/access/http2/tst_http2.cpp +++ b/tests/auto/network/access/http2/tst_http2.cpp @@ -32,8 +32,10 @@ #include <QtNetwork/private/http2protocol_p.h> #include <QtNetwork/qnetworkaccessmanager.h> +#include <QtNetwork/qhttp2configuration.h> #include <QtNetwork/qnetworkrequest.h> #include <QtNetwork/qnetworkreply.h> + #include <QtCore/qglobal.h> #include <QtCore/qobject.h> #include <QtCore/qthread.h> @@ -66,6 +68,26 @@ Q_DECLARE_METATYPE(QNetworkRequest::Attribute) QT_BEGIN_NAMESPACE +QHttp2Configuration qt_defaultH2Configuration() +{ + QHttp2Configuration config; + config.setStreamReceiveWindowSize(Http2::qtDefaultStreamReceiveWindowSize); + config.setSessionReceiveWindowSize(Http2::maxSessionReceiveWindowSize); + config.setServerPushEnabled(false); + return config; +} + +RawSettings qt_H2ConfigurationToSettings(const QHttp2Configuration &config = qt_defaultH2Configuration()) +{ + RawSettings settings; + settings[Http2::Settings::ENABLE_PUSH_ID] = config.serverPushEnabled(); + settings[Http2::Settings::INITIAL_WINDOW_SIZE_ID] = config.streamReceiveWindowSize(); + if (config.maxFrameSize() != Http2::minPayloadLimit) + settings[Http2::Settings::MAX_FRAME_SIZE_ID] = config.maxFrameSize(); + return settings; +} + + class tst_Http2 : public QObject { Q_OBJECT @@ -87,6 +109,7 @@ private slots: void earlyResponse(); void connectToHost_data(); void connectToHost(); + void maxFrameSize(); protected slots: // Slots to listen to our in-process server: @@ -110,12 +133,13 @@ private: // small payload. void runEventLoop(int ms = 5000); void stopEventLoop(); - Http2Server *newServer(const Http2::RawSettings &serverSettings, H2Type connectionType, - const Http2::ProtocolParameters &clientSettings = {}); + Http2Server *newServer(const RawSettings &serverSettings, H2Type connectionType, + const RawSettings &clientSettings = qt_H2ConfigurationToSettings()); // Send a get or post request, depending on a payload (empty or not). void sendRequest(int streamNumber, QNetworkRequest::Priority priority = QNetworkRequest::NormalPriority, - const QByteArray &payload = QByteArray()); + const QByteArray &payload = QByteArray(), + const QHttp2Configuration &clientConfiguration = qt_defaultH2Configuration()); QUrl requestUrl(H2Type connnectionType) const; quint16 serverPort = 0; @@ -131,14 +155,14 @@ private: bool prefaceOK = false; bool serverGotSettingsACK = false; - static const Http2::RawSettings defaultServerSettings; + static const RawSettings defaultServerSettings; }; #define STOP_ON_FAILURE \ if (QTest::currentTestFailed()) \ return; -const Http2::RawSettings tst_Http2::defaultServerSettings{{Http2::Settings::MAX_CONCURRENT_STREAMS_ID, 100}}; +const RawSettings tst_Http2::defaultServerSettings{{Http2::Settings::MAX_CONCURRENT_STREAMS_ID, 100}}; namespace { @@ -308,18 +332,15 @@ void tst_Http2::flowControlClientSide() nRequests = 10; windowUpdates = 0; - Http2::ProtocolParameters params; + QHttp2Configuration params; // A small window size for a session, and even a smaller one per stream - // this will result in WINDOW_UPDATE frames both on connection stream and // per stream. - params.maxSessionReceiveWindowSize = Http2::defaultSessionWindowSize * 5; - params.settingsFrameData[Settings::INITIAL_WINDOW_SIZE_ID] = Http2::defaultSessionWindowSize; - // Inform our manager about non-default settings: - manager->setProperty(Http2::http2ParametersPropertyName, QVariant::fromValue(params)); - - const Http2::RawSettings serverSettings = {{Settings::MAX_CONCURRENT_STREAMS_ID, quint32(3)}}; - ServerPtr srv(newServer(serverSettings, defaultConnectionType(), params)); + params.setSessionReceiveWindowSize(Http2::defaultSessionWindowSize * 5); + params.setStreamReceiveWindowSize(Http2::defaultSessionWindowSize); + const RawSettings serverSettings = {{Settings::MAX_CONCURRENT_STREAMS_ID, quint32(3)}}; + ServerPtr srv(newServer(serverSettings, defaultConnectionType(), qt_H2ConfigurationToSettings(params))); const QByteArray respond(int(Http2::defaultSessionWindowSize * 10), 'x'); srv->setResponseBody(respond); @@ -330,7 +351,7 @@ void tst_Http2::flowControlClientSide() QVERIFY(serverPort != 0); for (int i = 0; i < nRequests; ++i) - sendRequest(i); + sendRequest(i, QNetworkRequest::NormalPriority, {}, params); runEventLoop(120000); STOP_ON_FAILURE @@ -359,7 +380,7 @@ void tst_Http2::flowControlServerSide() serverPort = 0; nRequests = 10; - const Http2::RawSettings serverSettings = {{Settings::MAX_CONCURRENT_STREAMS_ID, 7}}; + const RawSettings serverSettings = {{Settings::MAX_CONCURRENT_STREAMS_ID, 7}}; ServerPtr srv(newServer(serverSettings, defaultConnectionType())); @@ -392,12 +413,11 @@ void tst_Http2::pushPromise() serverPort = 0; nRequests = 1; - Http2::ProtocolParameters params; + QHttp2Configuration params; // Defaults are good, except ENABLE_PUSH: - params.settingsFrameData[Settings::ENABLE_PUSH_ID] = 1; - manager->setProperty(Http2::http2ParametersPropertyName, QVariant::fromValue(params)); + params.setServerPushEnabled(true); - ServerPtr srv(newServer(defaultServerSettings, defaultConnectionType(), params)); + ServerPtr srv(newServer(defaultServerSettings, defaultConnectionType(), qt_H2ConfigurationToSettings(params))); srv->enablePushPromise(true, QByteArray("/script.js")); QMetaObject::invokeMethod(srv.data(), "startServer", Qt::QueuedConnection); @@ -410,6 +430,7 @@ void tst_Http2::pushPromise() QNetworkRequest request(url); request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, QVariant(true)); + request.setHttp2Configuration(params); auto reply = manager->get(request); connect(reply, &QNetworkReply::finished, this, &tst_Http2::replyFinished); @@ -592,6 +613,19 @@ void tst_Http2::connectToHost() #if QT_CONFIG(ssl) Q_ASSERT(!clearTextHTTP2 || connectionType != H2Type::h2Alpn); + +#if QT_CONFIG(securetransport) + // Normally on macOS we use plain text only for SecureTransport + // does not support ALPN on the server side. With 'direct encrytped' + // we have to use TLS sockets (== private key) and thus suppress a + // keychain UI asking for permission to use a private key. + // Our CI has this, but somebody testing locally - will have a problem. + qputenv("QT_SSL_USE_TEMPORARY_KEYCHAIN", QByteArray("1")); + auto envRollback = qScopeGuard([](){ + qunsetenv("QT_SSL_USE_TEMPORARY_KEYCHAIN"); + }); +#endif // QT_CONFIG(securetransport) + #else Q_ASSERT(connectionType == H2Type::h2c || connectionType == H2Type::h2cDirect); Q_ASSERT(targetServer->isClearText()); @@ -636,9 +670,6 @@ void tst_Http2::connectToHost() eventLoop.exitLoop(); QCOMPARE(reply->error(), QNetworkReply::NoError); QVERIFY(reply->isFinished()); - // Nothing must be sent yet: - QVERIFY(!prefaceOK); - QVERIFY(!serverGotSettingsACK); // Nothing received back: QVERIFY(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).isNull()); QCOMPARE(reply->readAll().size(), 0); @@ -668,6 +699,73 @@ void tst_Http2::connectToHost() QVERIFY(reply->isFinished()); } +void tst_Http2::maxFrameSize() +{ +#if !QT_CONFIG(ssl) + QSKIP("TLS support is needed for this test"); +#endif // QT_CONFIG(ssl) + + // Here we test we send 'MAX_FRAME_SIZE' setting in our + // 'SETTINGS'. If done properly, our server will not chunk + // the payload into several DATA frames. + +#if QT_CONFIG(securetransport) + // Normally on macOS we use plain text only for SecureTransport + // does not support ALPN on the server side. With 'direct encrytped' + // we have to use TLS sockets (== private key) and thus suppress a + // keychain UI asking for permission to use a private key. + // Our CI has this, but somebody testing locally - will have a problem. + qputenv("QT_SSL_USE_TEMPORARY_KEYCHAIN", QByteArray("1")); + auto envRollback = qScopeGuard([](){ + qunsetenv("QT_SSL_USE_TEMPORARY_KEYCHAIN"); + }); +#endif // QT_CONFIG(securetransport) + + auto connectionType = H2Type::h2Alpn; + auto attribute = QNetworkRequest::HTTP2AllowedAttribute; + if (clearTextHTTP2) { + connectionType = H2Type::h2Direct; + attribute = QNetworkRequest::Http2DirectAttribute; + } + + auto h2Config = qt_defaultH2Configuration(); + h2Config.setMaxFrameSize(Http2::minPayloadLimit * 3); + + serverPort = 0; + nRequests = 1; + + ServerPtr srv(newServer(defaultServerSettings, connectionType, + qt_H2ConfigurationToSettings(h2Config))); + srv->setResponseBody(QByteArray(Http2::minPayloadLimit * 2, 'q')); + QMetaObject::invokeMethod(srv.data(), "startServer", Qt::QueuedConnection); + runEventLoop(); + QVERIFY(serverPort != 0); + + const QSignalSpy frameCounter(srv.data(), &Http2Server::sendingData); + auto url = requestUrl(connectionType); + url.setPath(QString("/stream1.html")); + + QNetworkRequest request(url); + request.setAttribute(attribute, QVariant(true)); + request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("text/plain")); + request.setHttp2Configuration(h2Config); + + QNetworkReply *reply = manager->get(request); + reply->ignoreSslErrors(); + connect(reply, &QNetworkReply::finished, this, &tst_Http2::replyFinished); + + runEventLoop(); + STOP_ON_FAILURE + + // Normally, with a 16kb limit, our server would split such + // a response into 3 'DATA' frames (16kb + 16kb + 0|END_STREAM). + QCOMPARE(frameCounter.count(), 1); + + QVERIFY(nRequests == 0); + QVERIFY(prefaceOK); + QVERIFY(serverGotSettingsACK); +} + void tst_Http2::serverStarted(quint16 port) { serverPort = port; @@ -679,7 +777,6 @@ void tst_Http2::clearHTTP2State() windowUpdates = 0; prefaceOK = false; serverGotSettingsACK = false; - manager->setProperty(Http2::http2ParametersPropertyName, QVariant()); } void tst_Http2::runEventLoop(int ms) @@ -692,12 +789,11 @@ void tst_Http2::stopEventLoop() eventLoop.exitLoop(); } -Http2Server *tst_Http2::newServer(const Http2::RawSettings &serverSettings, H2Type connectionType, - const Http2::ProtocolParameters &clientSettings) +Http2Server *tst_Http2::newServer(const RawSettings &serverSettings, H2Type connectionType, + const RawSettings &clientSettings) { using namespace Http2; - auto srv = new Http2Server(connectionType, serverSettings, - clientSettings.settingsFrameData); + auto srv = new Http2Server(connectionType, serverSettings, clientSettings); using Srv = Http2Server; using Cl = tst_Http2; @@ -719,7 +815,8 @@ Http2Server *tst_Http2::newServer(const Http2::RawSettings &serverSettings, H2Ty void tst_Http2::sendRequest(int streamNumber, QNetworkRequest::Priority priority, - const QByteArray &payload) + const QByteArray &payload, + const QHttp2Configuration &h2Config) { auto url = requestUrl(defaultConnectionType()); url.setPath(QString("/stream%1.html").arg(streamNumber)); @@ -729,6 +826,7 @@ void tst_Http2::sendRequest(int streamNumber, request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, QVariant(true)); request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("text/plain")); request.setPriority(priority); + request.setHttp2Configuration(h2Config); QNetworkReply *reply = nullptr; if (payload.size()) diff --git a/tests/auto/network/access/qabstractnetworkcache/BLACKLIST b/tests/auto/network/access/qabstractnetworkcache/BLACKLIST deleted file mode 100644 index 12f45f0e12..0000000000 --- a/tests/auto/network/access/qabstractnetworkcache/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[cacheControl] -windows-10 msvc-2015 diff --git a/tests/auto/network/access/qftp/BLACKLIST b/tests/auto/network/access/qftp/BLACKLIST index 463030a089..0a99f3eb00 100644 --- a/tests/auto/network/access/qftp/BLACKLIST +++ b/tests/auto/network/access/qftp/BLACKLIST @@ -7,15 +7,10 @@ redhatenterpriselinuxworkstation-6.6 redhatenterpriselinuxworkstation-6.6 [list] -ubuntu-16.04 opensuse-leap -osx-10.11 windows-7sp1 -ubuntu-18.04 -osx-10.14 -b2qt -osx-10.12 windows-10 msvc-2015 -opensuse-42.3 +ubuntu +osx [list:epsvNotSupported] * diff --git a/tests/auto/network/access/qnetworkreply/BLACKLIST b/tests/auto/network/access/qnetworkreply/BLACKLIST index f9bbdd96c3..2a0651f96f 100644 --- a/tests/auto/network/access/qnetworkreply/BLACKLIST +++ b/tests/auto/network/access/qnetworkreply/BLACKLIST @@ -1,106 +1,53 @@ # See qtbase/src/testlib/qtestblacklist.cpp for format [authenticationCacheAfterCancel] -windows-10 msvc-2017 -windows-10 msvc-2015 -osx-10.13 windows-7sp1 -[httpAbort] -ubuntu-16.04 -rhel-7.6 +windows-10 msvc-2015 [backgroundRequestInterruption] -ubuntu-16.04 opensuse-leap -ubuntu-18.04 -b2qt -osx-10.12 windows-10 msvc-2015 -opensuse-42.3 +b2qt +ubuntu +osx [backgroundRequestInterruption:ftp, bg, nobg] * -[getErrors] -osx-10.13 -# QTBUG-71953 [getErrors:ftp-host] linux # QTBUG-71953 [getFromHttp] -rhel-6.6 -ubuntu-16.04 -rhel-7.6 -opensuse-leap -osx-10.11 -osx-10.13 -windows-7sp1 -ubuntu-18.04 -osx-10.14 -rhel-7.4 -b2qt -windows-10 msvc-2017 -osx-10.12 -windows-10 msvc-2015 -opensuse-42.3 +* !android !winrt [getFromHttp:success-external] * [getFromHttpIntoBuffer] -osx-10.12 -osx-10.13 +osx [getFromHttpIntoBuffer2] -windows-10 msvc-2015 -windows-10 msvc-2017 +windows-10 [headFromHttp] -osx-10.13 windows-10 msvc-2017 -[ioGetFromHttpWithSocksProxy] -osx-10.12 [ioPostToHttpFromSocket] # QTBUG-66247 -osx-10.13 windows-7sp1 windows-10 msvc-2017 -osx-10.12 -windows-10 msvc-2015 +osx [ioHttpRedirect] -windows-10 msvc-2015 # QTBUG-66602 -windows-10 msvc-2017 +windows-10 [ioHttpRedirectMultipartPost] -ubuntu-16.04 -rhel-7.6 # QTBUG-66247 -opensuse-leap -osx-10.13 -ubuntu-18.04 -rhel-7.4 b2qt -osx-10.12 windows-10 msvc-2015 -opensuse-42.3 +ubuntu +rhel [ioHttpRedirectPolicy] -ubuntu-16.04 opensuse-leap -windows-7sp1 -ubuntu-18.04 b2qt -windows-10 msvc-2017 -windows-10 msvc-2015 -opensuse-42.3 -[ioHttpRedirectPostPut] -osx-10.12 -windows-10 msvc-2015 +ubuntu +windows-10 [putToFtp] -windows-10 msvc-2017 +windows-10 [putWithServerClosingConnectionImmediately] -osx-10.11 -osx-10.13 -windows-7sp1 -windows-10 msvc-2017 -osx-10.12 -windows-10 msvc-2015 -[qtbug28035browserDoesNotLoadQtProjectOrgCorrectly] -windows-10 msvc-2015 windows-7sp1 -[authenticationWithDifferentRealm] -osx-10.13 +windows-10 +osx [backgroundRequest] osx-10.12 [connectToIPv6Address] @@ -109,141 +56,73 @@ osx-10.12 osx-10.12 [downloadProgress] osx-10.12 -[emitErrorForAllReplies] -osx-10.12 [encrypted] osx-10.13 -[ftpAuthentication] -osx-10.13 [httpCanReadLine] osx-10.12 -osx-10.13 [httpRecursiveCreation] -osx-10.12 -osx-10.13 +osx [httpWithNoCredentialUsage] osx-10.12 [ignoreSslErrorsList] -osx-10.12 -osx-10.13 +osx [ignoreSslErrorsListWithSlot] -osx-10.12 -osx-10.13 +osx [ioGetFromBuiltinHttp] -osx-10.12 -osx-10.11 -osx-10.14 -osx-10.13 +osx [ioGetFromHttp] osx-10.12 -[ioGetFromHttpWithAuth] -osx-10.12 -osx-10.13 -[ioGetFromHttpWithAuthSynchronous] -osx-10.12 -[ioGetFromHttpWithProxyAuth] -osx-10.12 -[ioGetFromHttpWithReuseParallel] -osx-10.12 -osx-10.13 -[ioGetFromHttpWithReuseSequential] -osx-10.12 -osx-10.13 -[ioGetFromHttpsWithIgnoreSslErrors] -osx-10.12 -[ioGetFromHttpsWithSslErrors] -osx-10.12 -[ioGetFromHttpsWithSslHandshakeError] -osx-10.12 -[ioGetWithManyProxies] -osx-10.12 [ioPostToHttpFromFile] osx-10.13 -[ioPostToHttpFromMiddleOfFileFiveBytes] -osx-10.13 -[ioPostToHttpFromMiddleOfFileToEnd] -osx-10.13 -[ioPostToHttpFromMiddleOfQBufferFiveBytes] -osx-10.13 [ioPostToHttpFromSocketSynchronous] -osx-10.12 -osx-10.13 -[ioPostToHttpNoBufferFlag] -osx-10.13 +osx [ioPostToHttpUploadProgress] -osx-10.12 -osx-10.11 -osx-10.13 +osx [ioPutToHttpFromFile] osx-10.13 [lastModifiedHeaderForHttp] osx-10.12 -osx-10.13 [multipartSkipIndices] osx-10.12 -osx-10.13 [nestedEventLoops] -osx-10.12 -osx-10.13 -[pipelining] -osx-10.13 +osx [postToHttp] osx-10.12 -osx-10.13 [postToHttpMultipart] osx-10.12 -osx-10.13 [postToHttpSynchronous] osx-10.12 -osx-10.13 [postToHttps] -osx-10.12 -osx-10.13 +osx [postToHttpsMultipart] -osx-10.12 -osx-10.13 +osx [postToHttpsSynchronous] -osx-10.12 -osx-10.13 +osx [putGetDeleteGetFromHttp] osx-10.12 -[putToHttp] -osx-10.12 -osx-10.13 [putToHttpSynchronous] osx-10.12 -osx-10.13 [putToHttps] -osx-10.12 -osx-10.13 +osx [putToHttpsSynchronous] -osx-10.12 -osx-10.13 +osx [putWithRateLimiting] -osx-10.12 osx-10.13 [qtbug13431replyThrottling] osx-10.12 [receiveCookiesFromHttp] -osx-10.12 -osx-10.13 +osx [receiveCookiesFromHttpSynchronous] -osx-10.12 -osx-10.13 +osx [sendCookies] -osx-10.12 -osx-10.13 +osx [sendCookiesSynchronous] -osx-10.12 -osx-10.13 +osx [sendCustomRequestToHttp] osx-10.12 [sslConfiguration] -osx-10.12 -osx-10.13 +osx [synchronousRequest] -osx-10.12 -osx-10.13 +osx [backgroundRequestConnectInBackground] -osx-10.12 -osx-10.13 +osx diff --git a/tests/auto/network/access/spdy/BLACKLIST b/tests/auto/network/access/spdy/BLACKLIST index ce2f7f383f..5cf79327be 100644 --- a/tests/auto/network/access/spdy/BLACKLIST +++ b/tests/auto/network/access/spdy/BLACKLIST @@ -1,8 +1,5 @@ [download] opensuse-leap -ubuntu-18.04 -ubuntu-16.04 -b2qt [upload] opensuse-leap ubuntu-18.04 diff --git a/tests/auto/network/kernel/qdnslookup/BLACKLIST b/tests/auto/network/kernel/qdnslookup/BLACKLIST index 4461d8b5f7..f07a8ce9a3 100644 --- a/tests/auto/network/kernel/qdnslookup/BLACKLIST +++ b/tests/auto/network/kernel/qdnslookup/BLACKLIST @@ -1,12 +1,2 @@ [lookup] -rhel-7.6 -opensuse-leap -osx-10.13 -windows-7sp1 -ubuntu-18.04 -rhel-7.4 -b2qt -windows-10 msvc-2017 -osx-10.12 -windows-10 msvc-2015 -opensuse-42.3 +* diff --git a/tests/auto/network/socket/qsocks5socketengine/BLACKLIST b/tests/auto/network/socket/qsocks5socketengine/BLACKLIST index f769aafbdd..61fff6ee00 100644 --- a/tests/auto/network/socket/qsocks5socketengine/BLACKLIST +++ b/tests/auto/network/socket/qsocks5socketengine/BLACKLIST @@ -4,8 +4,7 @@ ubuntu-18.04 # QTBUG-74162 [passwordAuth2] -osx-10.12 -ubuntu-18.04 +ubuntu [downloadBigFile] windows-10 msvc-2015 windows-7sp1 diff --git a/tests/auto/network/socket/qtcpserver/BLACKLIST b/tests/auto/network/socket/qtcpserver/BLACKLIST index ad0edf0af1..e268468bdb 100644 --- a/tests/auto/network/socket/qtcpserver/BLACKLIST +++ b/tests/auto/network/socket/qtcpserver/BLACKLIST @@ -1,24 +1,16 @@ -[listenWhileListening] -windows-10 msvc-2015 [listenWhileListening:WithSocks5Proxy] linux windows [ipv6Server] -windows-10 msvc-2015 windows-7sp1 windows-10 msvc-2017 [ipv6Server:WithoutProxy] windows osx -[addressReusable] -windows-10 msvc-2015 [eagainBlockingAccept] -windows-10 msvc-2015 -windows-7sp1 -windows-10 msvc-2017 -[proxyFactory] windows-7sp1 +windows-10 [serverAddress] -windows-10 msvc-2017 -windows-10 msvc-2015 windows-7sp1 +windows-10 + diff --git a/tests/auto/network/socket/qtcpsocket/BLACKLIST b/tests/auto/network/socket/qtcpsocket/BLACKLIST index 8c2f8d2638..07532710b3 100644 --- a/tests/auto/network/socket/qtcpsocket/BLACKLIST +++ b/tests/auto/network/socket/qtcpsocket/BLACKLIST @@ -5,9 +5,6 @@ windows-7sp1 windows [bind:[::]:randomport] windows -[timeoutConnect] -windows-10 msvc-2015 -# QTBUG-66247 [timeoutConnect:ip] windows # QTBUG-66247 diff --git a/tests/auto/network/socket/qudpsocket/BLACKLIST b/tests/auto/network/socket/qudpsocket/BLACKLIST index 9b5aa8a3fc..bc6068d695 100644 --- a/tests/auto/network/socket/qudpsocket/BLACKLIST +++ b/tests/auto/network/socket/qudpsocket/BLACKLIST @@ -2,15 +2,9 @@ windows-10 msvc-2017 windows-10 msvc-2015 windows-7sp1 -[multicastLeaveAfterClose] -osx-10.12 -osx-10.11 [readyReadForEmptyDatagram] opensuse-leap -ubuntu-16.04 [echo] opensuse-42.3 -[ipv6Loop] -osx-10.12 [readyReadForEmptyDatagram] linux diff --git a/tests/auto/network/ssl/qsslkey/BLACKLIST b/tests/auto/network/ssl/qsslkey/BLACKLIST index e9723001f5..19fb15cd1f 100644 --- a/tests/auto/network/ssl/qsslkey/BLACKLIST +++ b/tests/auto/network/ssl/qsslkey/BLACKLIST @@ -1,16 +1,9 @@ [constructor] -rhel-6.6 -rhel-7.4 -rhel-7.6 +rhel [length] -rhel-6.6 -rhel-7.4 -rhel-7.6 +rhel [toEncryptedPemOrDer] -rhel-6.6 -rhel-7.4 -rhel-7.6 +rhel [toPemOrDer] -rhel-6.6 -rhel-7.4 -rhel-7.6 +rhel + diff --git a/tests/auto/network/ssl/qsslsocket/BLACKLIST b/tests/auto/network/ssl/qsslsocket/BLACKLIST index 36143691c9..7b4a29f463 100644 --- a/tests/auto/network/ssl/qsslsocket/BLACKLIST +++ b/tests/auto/network/ssl/qsslsocket/BLACKLIST @@ -1,11 +1,7 @@ -[abortOnSslErrors] -windows-10 msvc-2015 [deprecatedProtocols] windows [spontaneousWrite] windows-7sp1 -[sslErrors] -windows-7sp1 [connectToHostEncrypted] osx-10.13 [setSslConfiguration] |