From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Thu, 2 Dec 2010 11:56:47 +0000 (+0000)
Subject: 1. Also use a time out when waiting for the view's selectionChanged signal.
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/28c5cd83368ebddda0f146f0b8bb5fa1569fbea3?ds=sidebyside

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 710ed9d65..3609efbd7 100644
--- 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 2161c9314..dbe4ee5de 100644
--- 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