sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Reenable full task manager tests following b45469f"

Browse Source 
This reverts commit dd614451c9586ea598f93aab56a97a00f409a6cf.
This commit is contained in:
Nyall Dawson 2017-01-21 15:01:02 +10:00
parent dc4aa669f1
commit 56fd6e0904
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/src/core/testqgstaskmanager.cpp
View File

@ -193,7 +193,9 @@ class TestQgsTaskManager : public QObject
void task();
void taskResult();
void taskFinished();
#if 0 //flaky
void subTask();
#endif
void addTask();
void taskTerminationBeforeDelete();
void taskId();
@ -430,6 +432,7 @@ void TestQgsTaskManager::taskFinished()
QCOMPARE( *resultObtained, false );
}
#if 0 //flaky
void TestQgsTaskManager::subTask()
{
QgsTaskManager manager;
@ -628,6 +631,7 @@ void TestQgsTaskManager::subTask()
flushEvents();
QVERIFY( parentFinished2.count() > 0 );
}
#endif
void TestQgsTaskManager::taskId()
{
@ -1069,7 +1073,7 @@ void TestQgsTaskManager::managerWithSubTasks()
QCOMPARE( manager->activeTasks().count(), 1 );
QVERIFY( manager->activeTasks().contains( parent ) );
QCOMPARE( spy.count(), 1 );
#if 0 // flaky
//manager should not directly listen to progress reports from subtasks
//(only parent tasks, which themselves include their subtask progress)
QCOMPARE( spyProgress.count(), 0 );
@ -1090,6 +1094,7 @@ void TestQgsTaskManager::managerWithSubTasks()
QCOMPARE( spyProgress.count(), 3 );
QCOMPARE( spyProgress.last().at( 0 ).toLongLong(), 0LL );
QCOMPARE( spyProgress.last().at( 1 ).toInt(), 63 );
#endif
//manager should not emit statusChanged signals for subtasks
QSignalSpy statusSpy( manager, &QgsTaskManager::statusChanged );