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

Unbreak test. Unfortunately it did not reproduce bug #28

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-18 12:11:42 +02:00
parent 7e8c5a980c
commit 99fe98a9cf
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/partition/tests/JobTests.cpp
View File

@ -101,7 +101,12 @@ JobTests::newCreatePartitionJob( Partition* freeSpacePartition, PartitionRole ro
Q_ASSERT( freeSpacePartition ); Q_ASSERT( freeSpacePartition );
qint64 firstSector = freeSpacePartition->firstSector(); qint64 firstSector = freeSpacePartition->firstSector();
qint64 lastSector = firstSector + size / m_device->logicalSectorSize(); qint64 lastSector;
if ( size > 0 )
lastSector = firstSector + size / m_device->logicalSectorSize();
else
lastSector = freeSpacePartition->lastSector();
FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector ); FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector );
Partition* partition = new Partition( Partition* partition = new Partition(
@ -171,7 +176,8 @@ JobTests::testCreatePartitionExtended()
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( job_ptr( job ) );
Partition* extendedPartition = job->partition(); Partition* extendedPartition = job->partition();
job = newCreatePartitionJob( firstFreePartition( extendedPartition ), PartitionRole( PartitionRole::Logical ), FileSystem::Ext4, 10 * MB); partition = firstFreePartition( extendedPartition );
job = newCreatePartitionJob( partition, PartitionRole( PartitionRole::Logical ), FileSystem::Ext4, 0);
job->updatePreview(); job->updatePreview();
m_queue.enqueue( job_ptr( job ) ); m_queue.enqueue( job_ptr( job ) );