From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Wed, 18 May 2011 00:26:00 +0000 (+1000)
Subject: Remove Q_ASSERT from qsslsocket autotest.
X-Git-Tag: qt-v5.0.0-alpha1~4297^2~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7e10b2a71f1fa196472544309dc59488229ebeb;p=profile%2Fivi%2Fqtbase.git

Remove Q_ASSERT from qsslsocket autotest.

Make the server thread exit early if the socket is invalid.  This will
make the test fail gracefully instead of crashing.

Change-Id: Ia9564c94dd32d65e6e9bdb4a2410f1512409546c
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit b9b3ced2eafe13e491d5af5ad7432733941bfd8d)

Conflicts:

	tests/auto/qsslsocket/tst_qsslsocket.cpp
---

diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index b508d47..507af5e 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -1565,8 +1565,8 @@ protected:
         // delayed start of encryption
         QTest::qSleep(100);
         QSslSocket *socket = server.socket;
-        QVERIFY(socket);
-        QVERIFY(socket->isValid());
+        if (!socket || !socket->isValid())
+            return;             // error
         socket->ignoreSslErrors();
         socket->startServerEncryption();
         if (!socket->waitForEncrypted(2000))