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

tst_QSslKey: remove blacklist

Browse Source 
And do not run the test with QSslSocket::supportsSsl() returns false -
this may mean unresolved symbols and thus missing functionality,
like i2d_X509 etc. This also makes cases more like other, that already
had those checks.

Fixes: QTBUG-87386
Change-Id: If4e9a650ca325b6f70956f532891a4c1d50465c0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Timur Pocheptsov 2020-11-30 13:03:57 +01:00
parent d545fbb61b
commit bf7cec737f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/network/ssl/qsslkey/BLACKLIST
View File

@ -6,9 +6,3 @@ rhel
rhel rhel
[toPemOrDer] [toPemOrDer]
rhel rhel
# QTBUG-87386
[passphraseChecks]
android
[noPassphraseChecks]
android

6
tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
View File

@ -515,6 +515,9 @@ void tst_QSslKey::toEncryptedPemOrDer()
void tst_QSslKey::passphraseChecks_data() void tst_QSslKey::passphraseChecks_data()
{ {
if (!QSslSocket::supportsSsl())
QSKIP("This test requires a working TLS library");
QTest::addColumn<QString>("fileName"); QTest::addColumn<QString>("fileName");
QTest::addColumn<QByteArray>("passphrase"); QTest::addColumn<QByteArray>("passphrase");
@ -574,6 +577,9 @@ void tst_QSslKey::passphraseChecks()
void tst_QSslKey::noPassphraseChecks() void tst_QSslKey::noPassphraseChecks()
{ {
if (!QSslSocket::supportsSsl())
QSKIP("This test requires a working TLS library");
// be sure and check a key without passphrase too // be sure and check a key without passphrase too
QString fileName(testDataDir + "rsa-without-passphrase.pem"); QString fileName(testDataDir + "rsa-without-passphrase.pem");
QFile keyFile(fileName); QFile keyFile(fileName);