From bba15a7cf56f36007f6dc4a2a1160eb33f577dd2 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 3 Feb 2025 12:51:16 +0100 Subject: [PATCH] QHttpServer auto-tests: use a function provided by QTest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of having code-duplicates. Pick-to: 6.9 6.8 Task-number: QTBUG-132645 Change-Id: I6976ae44a0ab14857d71d1cd6eef3cc09e40db34 Reviewed-by: Mårten Nordheim --- tests/auto/qabstracthttpserver/CMakeLists.txt | 1 + .../tst_qabstracthttpserver.cpp | 14 +++------- tests/auto/qhttpserver/CMakeLists.txt | 1 + tests/auto/qhttpserver/tst_qhttpserver.cpp | 27 +++---------------- .../qhttpservermultithreaded/CMakeLists.txt | 2 +- .../tst_qhttpservermultithreaded.cpp | 26 +++--------------- 6 files changed, 12 insertions(+), 59 deletions(-) diff --git a/tests/auto/qabstracthttpserver/CMakeLists.txt b/tests/auto/qabstracthttpserver/CMakeLists.txt index fa7866d..bf62673 100644 --- a/tests/auto/qabstracthttpserver/CMakeLists.txt +++ b/tests/auto/qabstracthttpserver/CMakeLists.txt @@ -13,4 +13,5 @@ qt_internal_add_test(tst_qabstracthttpserver LIBRARIES Qt::HttpServer Qt::NetworkPrivate + Qt::TestPrivate ) diff --git a/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp b/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp index c782fd9..9d279f5 100644 --- a/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp +++ b/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp @@ -12,8 +12,6 @@ #include #include -#include -#include #include #include #include @@ -36,6 +34,8 @@ #include #endif +#include + #if QT_CONFIG(ssl) constexpr char g_privateKey[] = R"(-----BEGIN RSA PRIVATE KEY----- @@ -417,18 +417,10 @@ void tst_QAbstractHttpServer::verifyWebSocketUpgrades() tcpServer.listen(); server.bind(&tcpServer); #if QT_CONFIG(ssl) -#ifdef Q_OS_MACOS -#if !QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000, 180000) - // Starting from macOS 15 our temporary keychain is ignored. - // We have to use kSecImportToMemoryOnly/kCFBooleanTrue key/value - // instead. This way we don't have to use QT_SSL_USE_TEMPORARY_KEYCHAIN anymore. - if (QSslSocket::activeBackend() == QLatin1String("securetransport") - && QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSequoia) { + if (QTestPrivate::isSecureTransportBlockingTest()) { // We were built with SDK below 15, but a file-based keychains are not working anymore on macOS 15... QSKIP("This test will block in keychain access"); } -#endif // QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE -#endif // Q_OS_MACOS QSslServer sslServer; QSslConfiguration sslConfiguration = QSslConfiguration::defaultConfiguration(); diff --git a/tests/auto/qhttpserver/CMakeLists.txt b/tests/auto/qhttpserver/CMakeLists.txt index 0902633..75193ae 100644 --- a/tests/auto/qhttpserver/CMakeLists.txt +++ b/tests/auto/qhttpserver/CMakeLists.txt @@ -15,6 +15,7 @@ qt_internal_add_test(tst_qhttpserver tst_qhttpserver.cpp LIBRARIES Qt::HttpServer + Qt::TestPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qhttpserver/tst_qhttpserver.cpp b/tests/auto/qhttpserver/tst_qhttpserver.cpp index 9093376..582e21f 100644 --- a/tests/auto/qhttpserver/tst_qhttpserver.cpp +++ b/tests/auto/qhttpserver/tst_qhttpserver.cpp @@ -10,8 +10,6 @@ #include -#include -#include #include #include #include @@ -41,6 +39,8 @@ #include #endif +#include + #include QT_BEGIN_NAMESPACE @@ -133,27 +133,6 @@ ignL7f4e1m2jh0oWTLhuP1hnVFN4KAKpVIJXhbEkH59cLCN6ARXiEHCM9rmK5Rgk NQZlAZc2w1Ha9lqisaWWpt42QVhQM64= -----END CERTIFICATE-----)"; -// Check if it's a macOS-build-with-SDK14 running on macOS 15: -bool sslServerIsBlockingKeychain() -{ -#ifdef Q_OS_MACOS - if (QSslSocket::activeBackend() != QLatin1String("securetransport")) - return false; -#if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000, 180000) - // Starting from macOS 15 our temporary keychain is ignored. - // We have to use kSecImportToMemoryOnly/kCFBooleanTrue key/value - // instead. This way we don't have to use QT_SSL_USE_TEMPORARY_KEYCHAIN anymore. - return false; -#else - if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSequoia) { - // We were built with SDK below 15, but a file-based keychains are not working anymore on macOS 15... - return true; - } -#endif -#endif // Q_OS_MACOS - return false; -} - #endif // QT_CONFIG(ssl) using namespace Qt::StringLiterals; @@ -562,7 +541,7 @@ void tst_QHttpServer::init() { #if QT_CONFIG(ssl) QFETCH_GLOBAL(const bool, useSsl); - if (useSsl && sslServerIsBlockingKeychain()) + if (useSsl && QTestPrivate::isSecureTransportBlockingTest()) QSKIP("SslServer is blocking the test execution while trying to access the login keychain"); #endif // QT_CONFIG(ssl) } diff --git a/tests/auto/qhttpservermultithreaded/CMakeLists.txt b/tests/auto/qhttpservermultithreaded/CMakeLists.txt index e402a43..2988248 100644 --- a/tests/auto/qhttpservermultithreaded/CMakeLists.txt +++ b/tests/auto/qhttpservermultithreaded/CMakeLists.txt @@ -9,5 +9,5 @@ qt_internal_add_test(tst_qhttpservermultithreaded SOURCES tst_qhttpservermultithreaded.cpp LIBRARIES - Qt::HttpServer Qt::Concurrent + Qt::HttpServer Qt::Concurrent Qt::TestPrivate ) diff --git a/tests/auto/qhttpservermultithreaded/tst_qhttpservermultithreaded.cpp b/tests/auto/qhttpservermultithreaded/tst_qhttpservermultithreaded.cpp index 95d0c29..3f98e8e 100644 --- a/tests/auto/qhttpservermultithreaded/tst_qhttpservermultithreaded.cpp +++ b/tests/auto/qhttpservermultithreaded/tst_qhttpservermultithreaded.cpp @@ -7,8 +7,6 @@ #include #include -#include -#include #include #include #include @@ -30,6 +28,8 @@ #include #include +#include + constexpr char g_privateKey[] = R"(-----BEGIN RSA PRIVATE KEY----- MIIJKAIBAAKCAgEAvdrtZtVquwiG12+vd3OjRVibdK2Ob73DOOWgb5rIgQ+B2Uzc OFa0xsiRyc/bam9CEEqgn5YHSn95LJHvN3dbsA8vrFqIXTkisFAuHJqsmsYZbAIi @@ -428,30 +428,10 @@ QString tst_QHttpServerMultithreaded::toString(qsizetype input) const void tst_QHttpServerMultithreaded::initTestCase_data() { - // Check if it's a macOS-build-with-SDK14 running on macOS 15: - auto sslServerIsBlockingKeychain = [] - { - #ifdef Q_OS_MACOS - #if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000, 180000) - // Starting from macOS 15 our temporary keychain is ignored. - // We have to use kSecImportToMemoryOnly/kCFBooleanTrue key/value - // instead. This way we don't have to use QT_SSL_USE_TEMPORARY_KEYCHAIN anymore. - return false; - #else - if (QSslSocket::activeBackend() == QLatin1String("securetransport") - && QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSequoia) { - // We were built with SDK below 15, but a file-based keychains are not working anymore on macOS 15... - return true; - } - #endif // QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE - #endif // Q_OS_MACOS - return false; - }; - QTest::addColumn("serverType"); QTest::addRow("TCP") << ServerType::TCP; #if QT_CONFIG(ssl) - if (QSslSocket::supportsSsl() && !sslServerIsBlockingKeychain()) + if (QSslSocket::supportsSsl() && !QTestPrivate::isSecureTransportBlockingTest()) QTest::addRow("SSL") << ServerType::SSL; else if (QSslSocket::supportsSsl()) qInfo("Not testing TLS, keychain access will block the test");