Skip to content
Permalink
Browse files

Reenable full task manager tests following b45469f

  • Loading branch information
nyalldawson committed Jan 19, 2017
1 parent 16eac9f commit dd614451c9586ea598f93aab56a97a00f409a6cf
Showing with 1 addition and 6 deletions.
  1. +1 −6 tests/src/core/testqgstaskmanager.cpp
@@ -193,9 +193,7 @@ class TestQgsTaskManager : public QObject
void task();
void taskResult();
void taskFinished();
#if 0 //flaky
void subTask();
#endif
void addTask();
void taskTerminationBeforeDelete();
void taskId();
@@ -432,7 +430,6 @@ void TestQgsTaskManager::taskFinished()
QCOMPARE( *resultObtained, false );
}

#if 0 //flaky
void TestQgsTaskManager::subTask()
{
QgsTaskManager manager;
@@ -631,7 +628,6 @@ void TestQgsTaskManager::subTask()
flushEvents();
QVERIFY( parentFinished2.count() > 0 );
}
#endif

void TestQgsTaskManager::taskId()
{
@@ -1073,7 +1069,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 );
@@ -1094,7 +1090,6 @@ 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 );

0 comments on commit dd61445

Please sign in to comment.
You can’t perform that action at this time.