1. Also use a time out when waiting for the view's selectionChanged signal.

2. Reduce the time out for the finishedPathLoading signal.

svn path=/trunk/KDE/kdebase/apps/; revision=1202815

diff --git a/src/tests/dolphinviewtest_allviewmodes.cpp b/src/tests/dolphinviewtest_allviewmodes.cpp
index 710ed9d6598af204e1470a5fd145dc40e71e5c70..3609efbd72cd71da63f22f2b0a60af7193aafc4d 100644 (file)
--- a/src/tests/dolphinviewtest_allviewmodes.cpp
+++ b/src/tests/dolphinviewtest_allviewmodes.cpp
@@ -117,7 +117,7 @@ void DolphinViewTest_AllViewModes::testSelection() {
 void DolphinViewTest_AllViewModes::verifySelectedItemsCount(int itemsCount) const
 {
     QSignalSpy spySelectionChanged(m_view, SIGNAL(selectionChanged(const KFileItemList&)));
-    QTest::kWaitForSignal(m_view, SIGNAL(selectionChanged(const KFileItemList&)));
+    QVERIFY(QTest::kWaitForSignal(m_view, SIGNAL(selectionChanged(const KFileItemList&)), 500));
 
     QCOMPARE(m_view->selectedItems().count(), itemsCount);
     QCOMPARE(m_view->selectedItemsCount(), itemsCount);

diff --git a/src/tests/testbase.cpp b/src/tests/testbase.cpp
index 2161c9314c4ca6b7a18d3850e31e538da121371a..dbe4ee5de6af1cd7c91976582d1ae36a29a5cb7d 100644 (file)
--- a/src/tests/testbase.cpp
+++ b/src/tests/testbase.cpp
@@ -67,7 +67,7 @@ QAbstractItemView* TestBase::itemView () const
 void TestBase::reloadViewAndWait()
 {
     m_view->reload();
-    QVERIFY(QTest::kWaitForSignal(m_view, SIGNAL(finishedPathLoading(const KUrl&)), 5000));
+    QVERIFY(QTest::kWaitForSignal(m_view, SIGNAL(finishedPathLoading(const KUrl&)), 2000));
 }
 
 KUrl TestBase::testDirUrl() const