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

tst_QNetworkReply: add more checks for blocking keychain

Browse Source 
There are more tests that create TLS server and can potentially
fail in case SecureTransport backend is in use.

Task-number: QTBUG-130500
Change-Id: Iaf2071c19f3cc0d3617bfc8c484b464c1a212d5a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 81e7d3f95a1646d91d126596d0d7d6acf106298a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Timur Pocheptsov 2024-11-06 09:41:09 +01:00 committed by Qt Cherry-pick Bot
parent 61c67cf499
commit 3502790551
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/network/access/qnetworkreply/BLACKLIST
View File

@ -11,7 +11,6 @@ opensuse-leap
b2qt b2qt
ubuntu ubuntu
windows-10 windows-10
macos-15 # QTBUG-130500
[putToFtp] [putToFtp]
windows-10 windows-10
[backgroundRequest] [backgroundRequest]

10
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -5617,6 +5617,9 @@ void tst_QNetworkReply::ioPostToHttpsUploadProgress()
{ {
//QFile sourceFile(testDataDir + "/bigfile"); //QFile sourceFile(testDataDir + "/bigfile");
//QVERIFY(sourceFile.open(QIODevice::ReadOnly)); //QVERIFY(sourceFile.open(QIODevice::ReadOnly));
if (QtNetworkTestHelpers::isSecureTransportBlockingTest())
QSKIP("SecureTransport: temporary keychain is not working on this version of macOS");
qint64 wantedSize = 2*1024*1024; // 2 MB qint64 wantedSize = 2*1024*1024; // 2 MB
QByteArray sourceFile; QByteArray sourceFile;
// And in the case of SSL, the compression can fool us and let the // And in the case of SSL, the compression can fool us and let the
@ -9147,6 +9150,9 @@ void tst_QNetworkReply::ioHttpRedirectErrors()
QFETCH(QNetworkReply::NetworkError, error); QFETCH(QNetworkReply::NetworkError, error);
QUrl localhost(url); QUrl localhost(url);
if (localhost.scheme() == QLatin1String("https") && QtNetworkTestHelpers::isSecureTransportBlockingTest())
QSKIP("SecureTransport: temporary keychain is not working on this version of macOS");
MiniHttpServer server("", localhost.scheme() == QLatin1String("https")); MiniHttpServer server("", localhost.scheme() == QLatin1String("https"));
localhost.setPort(server.serverPort()); localhost.setPort(server.serverPort());
@ -9223,6 +9229,8 @@ void tst_QNetworkReply::ioHttpRedirectPolicy()
QFETCH(const QNetworkRequest::RedirectPolicy, policy); QFETCH(const QNetworkRequest::RedirectPolicy, policy);
QFETCH(const bool, ssl); QFETCH(const bool, ssl);
if (ssl && QtNetworkTestHelpers::isSecureTransportBlockingTest())
QSKIP("SecureTransport: temporary keychain is not working on this version of macOS");
QFETCH(const int, redirectCount); QFETCH(const int, redirectCount);
QFETCH(const int, statusCode); QFETCH(const int, statusCode);
@ -9305,6 +9313,8 @@ void tst_QNetworkReply::ioHttpRedirectPolicyErrors()
QVERIFY(policy != QNetworkRequest::ManualRedirectPolicy); QVERIFY(policy != QNetworkRequest::ManualRedirectPolicy);
QFETCH(const bool, ssl); QFETCH(const bool, ssl);
if (ssl && QtNetworkTestHelpers::isSecureTransportBlockingTest())
QSKIP("SecureTransport: temporary keychain is not working on this version of macOS");
QFETCH(const QString, location); QFETCH(const QString, location);
QFETCH(const int, maxRedirects); QFETCH(const int, maxRedirects);
QFETCH(const QNetworkReply::NetworkError, expectedError); QFETCH(const QNetworkReply::NetworkError, expectedError);