From: Shane Kearns <ext-shane.2.kearns@nokia.com>
Date: Fri, 27 Jan 2012 16:49:00 +0000 (+0000)
Subject: Fix link error in QSslSocket auto test
X-Git-Tag: qt-v5.0.0-alpha1~1474
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=911ab74161a7727d97e7faa90148bbad0a421271;p=profile%2Fivi%2Fqtbase.git

Fix link error in QSslSocket auto test

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>
---

diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 94b602c..83060e2 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -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();
 }