diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-12-04 17:32:29 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-12-07 15:19:12 +0100 |
| commit | 4be6663cf2d3fc3d4df295f909bae722b2673c05 (patch) | |
| tree | f673338dbaad7b86442916e837afa48177622cd4 /tests/auto/network/access | |
| parent | a443cbe7cd7af86fe7eac54695ba5c169ec65aa9 (diff) | |
tst_qnetworkreply: unblacklist putWithServerClosingConnectionImmediately
Looking at grafana it rarely fails in dev so unblacklisting it.
Though it is a little more flaky after switching to http 2 by default
because then we only have one channel and more requests end up queued in
the same channel, which will get errored out when the server
disconnects.
Task-number: QTBUG-88943
Change-Id: If5d6335864ce6bbc35f519b2c6d7068e4181afd2
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'tests/auto/network/access')
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 3 |
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())); |