summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-04-27 10:05:25 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-04-27 10:05:25 (GMT)
commit32ecac261d2a6e7cd36a3718c40e35a7fcfb4d65 (patch)
treeba96619cd1239da708c4bca75d9624f1880b9692 /tests
parent001d46dffc6240da27634ef9e27b47f768587253 (diff)
downloadQt-32ecac261d2a6e7cd36a3718c40e35a7fcfb4d65.zip
Qt-32ecac261d2a6e7cd36a3718c40e35a7fcfb4d65.tar.gz
Qt-32ecac261d2a6e7cd36a3718c40e35a7fcfb4d65.tar.bz2
Enabled and fixed tst_QSslSocket::waitForMinusOne test for Symbian.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qsslsocket/tst_qsslsocket.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 67c7485..b62d629 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -1283,7 +1283,11 @@ protected:
// delayed acceptance:
QTest::qSleep(100);
- server.waitForNewConnection(2000);
+#ifndef Q_OS_SYMBIAN
+ bool ret = server.waitForNewConnection(2000);
+#else
+ bool ret = server.waitForNewConnection(20000);
+#endif
// delayed start of encryption
QTest::qSleep(100);
@@ -1329,7 +1333,6 @@ protected:
void tst_QSslSocket::waitForMinusOne()
{
-QSKIP("App stucks here if synchornized socket operations in use", SkipAll);
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)
return;