diff options
| author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-08-20 09:45:56 (GMT) |
|---|---|---|
| committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-08-21 08:01:43 (GMT) |
| commit | b6c331620d35dc8c16d9b74da4e6ee6531d777c7 (patch) | |
| tree | 82d8d05ab23ee7f93196416b19a45078ab63da85 /tests | |
| parent | a9f85cb516710f511f540a8a9db57d1b11ad3ac9 (diff) | |
| download | Qt-b6c331620d35dc8c16d9b74da4e6ee6531d777c7.zip Qt-b6c331620d35dc8c16d9b74da4e6ee6531d777c7.tar.gz Qt-b6c331620d35dc8c16d9b74da4e6ee6531d777c7.tar.bz2 | |
Cleaning test cases.
In some situations we had different setup on Symbian platform.
Moslty when it comes to the timing issues.
We want to revert those where possible.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qlocalsocket/tst_qlocalsocket.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp index 3c42ecb..bdd2efa 100644 --- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp @@ -368,7 +368,7 @@ void tst_QLocalSocket::listenAndConnect() QSignalSpy spyReadyRead(socket, SIGNAL(readyRead())); socket->connectToServer(name); -#if defined(QT_LOCALSOCKET_TCP) || defined (Q_OS_SYMBIAN) +#if defined(QT_LOCALSOCKET_TCP) QTest::qWait(250); #endif @@ -494,7 +494,7 @@ void tst_QLocalSocket::sendData() QCOMPARE(server.waitForNewConnection(3000, &timedOut), canListen); -#if defined(QT_LOCALSOCKET_TCP) || defined(Q_OS_SYMBIAN) +#if defined(QT_LOCALSOCKET_TCP) QTest::qWait(250); #endif QVERIFY(!timedOut); @@ -570,9 +570,6 @@ void tst_QLocalSocket::fullPath() LocalSocket socket; socket.connectToServer(serverName); -#if defined (Q_OS_SYMBIAN) - QTest::qWait(250); -#endif QCOMPARE(socket.serverName(), serverName); QCOMPARE(socket.fullServerName(), serverName); @@ -736,7 +733,7 @@ void tst_QLocalSocket::threadedConnection() server.wait(); while (!clients.isEmpty()) { - QVERIFY(clients.first()->wait(30000)); + QVERIFY(clients.first()->wait(3000)); Client *client =clients.takeFirst(); client->terminate(); delete client; |