From 63e017ee7771804aac1be1ede5771e0c574c59e3 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Tue, 10 Feb 2015 14:35:40 +0100 Subject: [PATCH] QSslSocket test - adapt 'verifyClientCertificate' for Secure Transport Secure Transport relies on keychains, both client/server are constantly updating default keychain and as a result tests are failing: when verification is expected to fail, it succeeds; when the number of certificates is expected to be 1 - it's 2 (Secure Transport can find certificates in a keychain). This makes verifyClientCertificate test quite useless at the moment - QSKIP it. Change-Id: I578398b4912a86dc60f585ac5a1bdd0098914005 Reviewed-by: Richard J. Moore --- tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 7dca9e6387..f4d3555531 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -2871,6 +2871,14 @@ void tst_QSslSocket::verifyClientCertificate_data() void tst_QSslSocket::verifyClientCertificate() { +#ifdef QT_SECURETRANSPORT + // We run both client and server on the same machine, + // this means, client can update keychain with client's certificates, + // and server later will use the same certificates from the same + // keychain thus making tests fail (wrong number of certificates, + // success instead of failure etc.). + QSKIP("This test can not work with Secure Transport"); +#endif if (!QSslSocket::supportsSsl()) { qWarning("SSL not supported, skipping test"); return;