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

Reenable full task manager tests following b45469f

Browse Source
This commit is contained in:
Nyall Dawson 2017-01-20 08:26:56 +10:00
parent 16eac9f243
commit dd614451c9
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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