diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-11-30 13:03:57 +0100 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-11-30 23:11:04 +0100 |
commit | bf7cec737f9dbb330776aa1d4bf7f130c880e911 (patch) | |
tree | 4faf64ef39e76ebd0f791112c485b22de6681b50 /tests/auto | |
parent | d545fbb61b699802e9ae1a3c19f4c4bef724fbda (diff) |
tst_QSslKey: remove blacklist
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>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/network/ssl/qsslkey/BLACKLIST | 6 | ||||
-rw-r--r-- | tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/network/ssl/qsslkey/BLACKLIST b/tests/auto/network/ssl/qsslkey/BLACKLIST index b9d7b69528..5705a1982d 100644 --- a/tests/auto/network/ssl/qsslkey/BLACKLIST +++ b/tests/auto/network/ssl/qsslkey/BLACKLIST @@ -6,9 +6,3 @@ rhel rhel [toPemOrDer] rhel - -# QTBUG-87386 -[passphraseChecks] -android -[noPassphraseChecks] -android diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp index dbb7390591..b96ee4c56b 100644 --- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp +++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp @@ -515,6 +515,9 @@ void tst_QSslKey::toEncryptedPemOrDer() void tst_QSslKey::passphraseChecks_data() { + if (!QSslSocket::supportsSsl()) + QSKIP("This test requires a working TLS library"); + QTest::addColumn<QString>("fileName"); QTest::addColumn<QByteArray>("passphrase"); @@ -574,6 +577,9 @@ void tst_QSslKey::passphraseChecks() void tst_QSslKey::noPassphraseChecks() { + if (!QSslSocket::supportsSsl()) + QSKIP("This test requires a working TLS library"); + // be sure and check a key without passphrase too QString fileName(testDataDir + "rsa-without-passphrase.pem"); QFile keyFile(fileName); |