summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2024-03-13 14:30:15 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2024-03-14 19:01:43 +0100
commit5e102a792c4ee0db180defe480cb96c197871508 (patch)
tree9db3fb3a217fccee01e56cf8714f8497dd238b6b
parente102edfbf8db3a0a541de2a8a3e3782b7e5b234b (diff)
tst_QNetworkReply: cleanup changed state from timeout test
It was not setting the value _back_ to 0 when the function ended and this caused qtbug68821proxyError to fail fairly consistently on Windows when it was running in the same run. qtbug68821proxyError was always succeeding when ran by itself so it was quite odd. Pick-to: 6.7 Change-Id: Ifa4982f1b10128674081136a30bdab4b0ce7004a Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
-rw-r--r--tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 5df2c52c76..22335690c5 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -9948,6 +9948,7 @@ void tst_QNetworkReply::requestWithTimeout()
// Manager instance remains between case runs => always reset it's transferTimeout to
// ensure setting its transferTimeout in this case has effect
manager.setTransferTimeout(0ms);
+ auto cleanup = qScopeGuard([this] { manager.setTransferTimeout(0ms); });
MiniHttpServer server(tst_QNetworkReply::httpEmpty200Response, false);
server.stopTransfer = true;