napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Fix tests after removal of single-job-enqueue

Browse Source
This commit is contained in:
Adriaan de Groot 2020-08-19 11:28:53 +02:00
parent c296bcffa3
commit 08ea51a344
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/partition/tests/PartitionJobTests.cpp
View File

@ -223,7 +223,7 @@ PartitionJobTests::queuePartitionTableCreation( PartitionTable::TableType type )
{ {
auto job = new CreatePartitionTableJob( m_device.data(), type ); auto job = new CreatePartitionTableJob( m_device.data(), type );
job->updatePreview(); job->updatePreview();
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( 1, JobList() << job_ptr( job ) );
} }
CreatePartitionJob* CreatePartitionJob*
@ -275,7 +275,7 @@ PartitionJobTests::testCreatePartition()
Partition* partition1 = job->partition(); Partition* partition1 = job->partition();
QVERIFY( partition1 ); QVERIFY( partition1 );
job->updatePreview(); job->updatePreview();
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( 1, JobList() << job_ptr( job ) );
freePartition = firstFreePartition( m_device->partitionTable() ); freePartition = firstFreePartition( m_device->partitionTable() );
QVERIFY( freePartition ); QVERIFY( freePartition );
@ -283,7 +283,7 @@ PartitionJobTests::testCreatePartition()
Partition* partition2 = job->partition(); Partition* partition2 = job->partition();
QVERIFY( partition2 ); QVERIFY( partition2 );
job->updatePreview(); job->updatePreview();
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( 1, JobList() << job_ptr( job ) );
freePartition = firstFreePartition( m_device->partitionTable() ); freePartition = firstFreePartition( m_device->partitionTable() );
QVERIFY( freePartition ); QVERIFY( freePartition );
@ -291,7 +291,7 @@ PartitionJobTests::testCreatePartition()
Partition* partition3 = job->partition(); Partition* partition3 = job->partition();
QVERIFY( partition3 ); QVERIFY( partition3 );
job->updatePreview(); job->updatePreview();
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( 1, JobList() << job_ptr( job ) );
QVERIFY( m_runner.run() ); QVERIFY( m_runner.run() );
@ -316,14 +316,14 @@ PartitionJobTests::testCreatePartitionExtended()
Partition* partition1 = job->partition(); Partition* partition1 = job->partition();
QVERIFY( partition1 ); QVERIFY( partition1 );
job->updatePreview(); job->updatePreview();
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( 1, JobList() << job_ptr( job ) );
freePartition = firstFreePartition( m_device->partitionTable() ); freePartition = firstFreePartition( m_device->partitionTable() );
QVERIFY( freePartition ); QVERIFY( freePartition );
job = newCreatePartitionJob( job = newCreatePartitionJob(
freePartition, PartitionRole( PartitionRole::Extended ), FileSystem::Extended, 10_MiB ); freePartition, PartitionRole( PartitionRole::Extended ), FileSystem::Extended, 10_MiB );
job->updatePreview(); job->updatePreview();
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( 1, JobList() << job_ptr( job ) );
Partition* extendedPartition = job->partition(); Partition* extendedPartition = job->partition();
freePartition = firstFreePartition( extendedPartition ); freePartition = firstFreePartition( extendedPartition );
@ -332,7 +332,7 @@ PartitionJobTests::testCreatePartitionExtended()
Partition* partition2 = job->partition(); Partition* partition2 = job->partition();
QVERIFY( partition2 ); QVERIFY( partition2 );
job->updatePreview(); job->updatePreview();
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( 1, JobList() << job_ptr( job ) );
QVERIFY( m_runner.run() ); QVERIFY( m_runner.run() );
@ -394,7 +394,7 @@ PartitionJobTests::testResizePartition()
KPM_PARTITION_FLAG( None ) ); KPM_PARTITION_FLAG( None ) );
CreatePartitionJob* job = new CreatePartitionJob( m_device.data(), partition ); CreatePartitionJob* job = new CreatePartitionJob( m_device.data(), partition );
job->updatePreview(); job->updatePreview();
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( 1, JobList() << job_ptr( job ) );
QVERIFY( m_runner.run() ); QVERIFY( m_runner.run() );
} }
@ -418,7 +418,7 @@ PartitionJobTests::testResizePartition()
// Resize // Resize
ResizePartitionJob* job = new ResizePartitionJob( m_device.data(), partition, newFirst, newLast ); ResizePartitionJob* job = new ResizePartitionJob( m_device.data(), partition, newFirst, newLast );
job->updatePreview(); job->updatePreview();
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( 1, JobList() << job_ptr( job ) );
QVERIFY( m_runner.run() ); QVERIFY( m_runner.run() );
QCOMPARE( partition->firstSector(), newFirst ); QCOMPARE( partition->firstSector(), newFirst );