1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_Http2: Ensure each test uses temporary keychain if needed

Browse Source 
The duplicateRequestsWithAborts test was missing this, causing failures
on macOS 14. Instead of adding it to each test function, we now set up
the temporary key chain in init(), and restore things in cleanup().

Task-number: QTBUG-119616
Change-Id: Ia9d80ae632774b8628417ad30d354a22b6a4916e
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 882e5d72fc2dcca3c35035564fbb9ce5abc4bc4c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-09-27 11:01:36 +02:00 committed by Qt Cherry-pick Bot
parent 47ee855740
commit d8c7364ffe
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/auto/network/access/http2/tst_http2.cpp
View File

@ -68,6 +68,7 @@ public:
~tst_Http2();
public slots:
void init();
void cleanup();
private slots:
// Tests:
void defaultQnamHttp2Configuration();
@ -126,7 +127,8 @@ protected slots:
void replyFinishedWithError();
private:
[[nodiscard]] auto useTemporaryKeychain()
std::function<void()> m_temporaryKeyChainRollback;
[[nodiscard]] std::function<void()> useTemporaryKeychain()
{
#if QT_CONFIG(securetransport)
// Normally on macOS we use plain text only for SecureTransport
@ -136,16 +138,16 @@ private:
// Our CI has this, but somebody testing locally - will have a problem.
auto value = qEnvironmentVariable("QT_SSL_USE_TEMPORARY_KEYCHAIN");
qputenv("QT_SSL_USE_TEMPORARY_KEYCHAIN", "1");
auto envRollback = qScopeGuard([value](){
auto envRollback = [value](){
if (value.isEmpty())
qunsetenv("QT_SSL_USE_TEMPORARY_KEYCHAIN");
else
qputenv("QT_SSL_USE_TEMPORARY_KEYCHAIN", value.toUtf8());
});
};
return envRollback;
#else
// avoid maybe-unused warnings from callers
return qScopeGuard([]{});
return {};
#endif // QT_CONFIG(securetransport)
}
@ -241,6 +243,15 @@ tst_Http2::~tst_Http2()
void tst_Http2::init()
{
manager.reset(new QNetworkAccessManager);
m_temporaryKeyChainRollback = useTemporaryKeychain();
}
void tst_Http2::cleanup()
{
if (m_temporaryKeyChainRollback)
m_temporaryKeyChainRollback();
m_temporaryKeyChainRollback = {};
}
void tst_Http2::defaultQnamHttp2Configuration()
@ -273,8 +284,6 @@ void tst_Http2::singleRequest()
{
clearHTTP2State();
auto rollback = useTemporaryKeychain();
serverPort = 0;
nRequests = 1;
@ -718,8 +727,6 @@ void tst_Http2::connectToHost()
#if QT_CONFIG(ssl)
Q_ASSERT(!clearTextHTTP2 || connectionType != H2Type::h2Alpn);
auto rollback = useTemporaryKeychain();
#else
Q_ASSERT(connectionType == H2Type::h2c || connectionType == H2Type::h2cDirect);
Q_ASSERT(targetServer->isClearText());
@ -806,8 +813,6 @@ void tst_Http2::maxFrameSize()
// 'SETTINGS'. If done properly, our server will not chunk
// the payload into several DATA frames.
auto rollback = useTemporaryKeychain();
auto connectionType = H2Type::h2Alpn;
auto attribute = QNetworkRequest::Http2AllowedAttribute;
if (clearTextHTTP2) {
@ -961,8 +966,6 @@ void tst_Http2::moreActivitySignals()
{
clearHTTP2State();
auto rollback = useTemporaryKeychain();
serverPort = 0;
QFETCH(H2Type, connectionType);
ServerPtr srv(newServer(defaultServerSettings, connectionType));
@ -1064,8 +1067,6 @@ void tst_Http2::contentEncoding()
{
clearHTTP2State();
auto rollback = useTemporaryKeychain();
QFETCH(H2Type, connectionType);
ServerPtr targetServer(newServer(defaultServerSettings, connectionType));
@ -1529,8 +1530,6 @@ void tst_Http2::abortOnEncrypted()
QSKIP("TLS support is needed for this test");
#else
auto rollback = useTemporaryKeychain();
clearHTTP2State();
serverPort = 0;