diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-07-14 15:58:08 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2021-07-22 14:09:49 +0000 |
| commit | 0995d4a7f6c51e2a2a19f1fe4b6bc42980f8d6bb (patch) | |
| tree | e76b13289ad53310e59f0bb500075edbf578d7cd | |
| parent | 400fe7839e50705d71066e12245d4e64fd658e67 (diff) | |
tst_QSslSocket: clean up allowedProtocolNegotiation
Switch to QCOMPARE to get better output.
Delete the extra checking for schannel, we don't support Windows 8 anymore.
Change-Id: Icd310c32939cb577c9f3438789f667aa0a3a4d85
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 9c67aa2da1fa8c0c1ec347ac43d0aabf1a35b429)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 8dc27af20a..bd7b4e043f 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -3729,11 +3729,6 @@ void tst_QSslSocket::allowedProtocolNegotiation() if (!hasServerAlpn) QSKIP("Server-side ALPN is unsupported, skipping test"); - if (isTestingSchannel) { - if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows8_1) - QSKIP("ALPN is not supported on this version of Windows using Schannel."); - } - QFETCH_GLOBAL(bool, setProxy); if (setProxy) return; @@ -3762,9 +3757,9 @@ void tst_QSslSocket::allowedProtocolNegotiation() connect(&clientSocket, SIGNAL(encrypted()), &loop, SLOT(quit())); loop.exec(); - QVERIFY(server.socket->sslConfiguration().nextNegotiatedProtocol() == - clientSocket.sslConfiguration().nextNegotiatedProtocol()); - QVERIFY(server.socket->sslConfiguration().nextNegotiatedProtocol() == expectedNegotiated); + QCOMPARE(server.socket->sslConfiguration().nextNegotiatedProtocol(), + clientSocket.sslConfiguration().nextNegotiatedProtocol()); + QCOMPARE(server.socket->sslConfiguration().nextNegotiatedProtocol(), expectedNegotiated); } #if QT_CONFIG(openssl) |