diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-05-19 07:54:59 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-05-19 07:54:59 (GMT) |
| commit | a819aa88e3aee10ffff595c0a1de139bf63e9526 (patch) | |
| tree | 224c9c5099479f11e620e587db39b1183433e175 | |
| parent | 1441dabcbbe21c7feba2e9335b19ab99235a6958 (diff) | |
| parent | c120d4ef6082a9e23e88ca069c72ac597719349f (diff) | |
| download | Qt-a819aa88e3aee10ffff595c0a1de139bf63e9526.zip Qt-a819aa88e3aee10ffff595c0a1de139bf63e9526.tar.gz Qt-a819aa88e3aee10ffff595c0a1de139bf63e9526.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | tests/auto/qftp/tst_qftp.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp index 3f1c511..0f6702c 100644 --- a/tests/auto/qftp/tst_qftp.cpp +++ b/tests/auto/qftp/tst_qftp.cpp @@ -1556,14 +1556,16 @@ void tst_QFtp::binaryAscii() ResMapIt it2 = resultMap.find(QFtp::Get); QVERIFY(it2 != resultMap.end()); QVERIFY(it2.value().success); +/* #ifdef Q_OS_SYMBIAN QVERIFY(getData.size() == putData.size()); #else +*/ // most modern ftp servers leave the file as it is by default // (and do not remove the windows line ending), the -1 below could be // deleted in the future QVERIFY(getData.size() == putData.size()-1); -#endif +//#endi ////////////////////////////////////////////////////////////////// // cleanup (i.e. remove the file) -- this also tests the remove command init(); diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index c5c2942..acc1d42 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -2197,7 +2197,7 @@ void tst_QNetworkReply::ioGetWithManyProxies() #ifndef Q_OS_SYMBIAN QTestEventLoop::instance().enterLoop(10); #else - QTestEventLoop::instance().enterLoop(30); + QTestEventLoop::instance().enterLoop(60); #endif QVERIFY(!QTestEventLoop::instance().timeout()); @@ -2677,6 +2677,11 @@ void tst_QNetworkReply::downloadProgress() QFETCH(int, loopCount); for (int i = 1; i <= loopCount; ++i) { +#ifdef Q_OS_SYMBIAN + if(i % 500 == 0) { + qWarning("iteration %d", i); + } +#endif sender->write(data); QVERIFY2(sender->waitForBytesWritten(2000), "Network timeout"); |