Skip to content

Commit 56fd6e0

Browse files
committed
Revert "Reenable full task manager tests following b45469f"
This reverts commit dd61445.
1 parent dc4aa66 commit 56fd6e0

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

‎tests/src/core/testqgstaskmanager.cpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,9 @@ class TestQgsTaskManager : public QObject
193193
void task();
194194
void taskResult();
195195
void taskFinished();
196+
#if 0 //flaky
196197
void subTask();
198+
#endif
197199
void addTask();
198200
void taskTerminationBeforeDelete();
199201
void taskId();
@@ -430,6 +432,7 @@ void TestQgsTaskManager::taskFinished()
430432
QCOMPARE( *resultObtained, false );
431433
}
432434

435+
#if 0 //flaky
433436
void TestQgsTaskManager::subTask()
434437
{
435438
QgsTaskManager manager;
@@ -628,6 +631,7 @@ void TestQgsTaskManager::subTask()
628631
flushEvents();
629632
QVERIFY( parentFinished2.count() > 0 );
630633
}
634+
#endif
631635

632636
void TestQgsTaskManager::taskId()
633637
{
@@ -1069,7 +1073,7 @@ void TestQgsTaskManager::managerWithSubTasks()
10691073
QCOMPARE( manager->activeTasks().count(), 1 );
10701074
QVERIFY( manager->activeTasks().contains( parent ) );
10711075
QCOMPARE( spy.count(), 1 );
1072-
1076+
#if 0 // flaky
10731077
//manager should not directly listen to progress reports from subtasks
10741078
//(only parent tasks, which themselves include their subtask progress)
10751079
QCOMPARE( spyProgress.count(), 0 );
@@ -1090,6 +1094,7 @@ void TestQgsTaskManager::managerWithSubTasks()
10901094
QCOMPARE( spyProgress.count(), 3 );
10911095
QCOMPARE( spyProgress.last().at( 0 ).toLongLong(), 0LL );
10921096
QCOMPARE( spyProgress.last().at( 1 ).toInt(), 63 );
1097+
#endif
10931098

10941099
//manager should not emit statusChanged signals for subtasks
10951100
QSignalSpy statusSpy( manager, &QgsTaskManager::statusChanged );

0 commit comments

Comments
 (0)