From 6e7a15f5c50a94216bcf35241ec008e6c419ba18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 18 Dec 2024 14:05:15 +0100 Subject: [PATCH] tst_QHttp2Connection: make settings exchange wait for acknowledgement Is needed when sending more SETTINGS frames during the test later Task-number: QTBUG-132277 Pick-to: 6.9 6.8 Change-Id: I24b2a5d1b2e7aecd8687db5b24f37233df3b91dd Reviewed-by: Timur Pocheptsov --- .../network/access/qhttp2connection/tst_qhttp2connection.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/auto/network/access/qhttp2connection/tst_qhttp2connection.cpp b/tests/auto/network/access/qhttp2connection/tst_qhttp2connection.cpp index dfa73a4a457..342ebd7e74b 100644 --- a/tests/auto/network/access/qhttp2connection/tst_qhttp2connection.cpp +++ b/tests/auto/network/access/qhttp2connection/tst_qhttp2connection.cpp @@ -153,7 +153,8 @@ bool tst_QHttp2Connection::waitForSettingsExchange(QHttp2Connection *client, client->handleReadyRead(); // handle incoming frames, send response bool success = QTest::qWaitFor([&]() { - return settingsFrameReceived && serverSettingsFrameReceived; + return settingsFrameReceived && serverSettingsFrameReceived + && !client->waitingForSettingsACK && !server->waitingForSettingsACK; }); disconnect(c);