From 4e463e50ace02f31f4d23a5b414f86d62c43eb25 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Mon, 18 May 2009 15:46:35 +0200 Subject: Our ftp server removes windiws line ending. --- tests/auto/qftp/tst_qftp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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(); -- cgit v0.12 From dc06f947f5a2b300c4396a8ec1d8793f594e2d86 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Mon, 18 May 2009 18:01:33 +0200 Subject: Testing on symbina requires more time. --- tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index d7faa73..8a12b0b 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -2146,7 +2146,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()); -- cgit v0.12 From d050d43c27b25ad7914f2970ef9933655caa0d44 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Mon, 18 May 2009 18:04:22 +0200 Subject: Performance on Symbian with Open C 1.5.3 pre-release is bad and I needed some progress display to see if test is alive or not. I print line every 500 iteration. --- tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index 8a12b0b..f07bb6e 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -2626,6 +2626,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"); -- cgit v0.12