summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/network/access/qnetworkreply/BLACKLIST4
-rw-r--r--tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp3
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/network/access/qnetworkreply/BLACKLIST b/tests/auto/network/access/qnetworkreply/BLACKLIST
index 8b02de04f3..b10a90e8ac 100644
--- a/tests/auto/network/access/qnetworkreply/BLACKLIST
+++ b/tests/auto/network/access/qnetworkreply/BLACKLIST
@@ -16,10 +16,6 @@ ubuntu
windows-10
[putToFtp]
windows-10
-[putWithServerClosingConnectionImmediately]
-windows-7sp1
-windows-10
-osx
[backgroundRequest]
macos
[connectToIPv6Address]
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 2485b6f3ac..5af1314880 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -9077,6 +9077,9 @@ void tst_QNetworkReply::putWithServerClosingConnectionImmediately()
for (int i = 0; i < numUploads; i++) {
// create the request
QNetworkRequest request(QUrl(urlPrefix + QString::number(i)));
+ // Disable http2 so we get the 6 simultaneous channels as when
+ // the test was originally written
+ request.setAttribute(QNetworkRequest::Http2AllowedAttribute, false);
QNetworkReply *reply = manager.put(request, sourceFile);
connect(reply, SIGNAL(sslErrors(QList<QSslError>)), reply, SLOT(ignoreSslErrors()));
connect(reply, SIGNAL(finished()), &server, SLOT(replyFinished()));