Fix link error in QSslSocket auto test
authorShane Kearns <ext-shane.2.kearns@nokia.com>
Fri, 27 Jan 2012 16:49:00 +0000 (16:49 +0000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 30 Jan 2012 19:18:28 +0000 (20:18 +0100)
This has been broken for months, but invisible because the code causing
the link error is unreachable (due to QSKIP). So the link error only
occurs in debug builds with -O0.

Change-Id: I6093a7803bedf37bfc8c2d9ff0b28b2309b57959
Reviewed-by: Richard J. Moore <rich@kde.org>
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp

index 94b602c..83060e2 100644 (file)
@@ -1322,8 +1322,8 @@ void tst_QSslSocket::wildcard()
     QVERIFY2(socket->waitForEncrypted(3000), qPrintable(socket->errorString()));
 
     QSslCertificate certificate = socket->peerCertificate();
-    QCOMPARE(certificate.subjectInfo(QSslCertificate::CommonName), QString(QtNetworkSettings::serverLocalName() + ".*." + QtNetworkSettings::serverDomainName()));
-    QCOMPARE(certificate.issuerInfo(QSslCertificate::CommonName), QtNetworkSettings::serverName());
+    QVERIFY(certificate.subjectInfo(QSslCertificate::CommonName).contains(QString(QtNetworkSettings::serverLocalName() + ".*." + QtNetworkSettings::serverDomainName())));
+    QVERIFY(certificate.issuerInfo(QSslCertificate::CommonName).contains(QtNetworkSettings::serverName()));
 
     socket->close();
 }