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

[partition] Extend test, fix bug indicated by test

Browse Source 
Copy-paste-o, was using wrong string value for minimum size,
found by failing unit test.
This commit is contained in:
Adriaan de Groot 2023-11-13 00:37:03 +01:00
parent 45c11135b8
commit 3e758d2d5c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/partition/Config.cpp
View File

@ -317,7 +317,7 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu
const auto efiMinimumSize = Calamares::getString( efiConfiguration, "minimumSize" ); const auto efiMinimumSize = Calamares::getString( efiConfiguration, "minimumSize" );
if ( !efiMinimumSize.isEmpty() ) if ( !efiMinimumSize.isEmpty() )
{ {
Calamares::Partition::PartitionSize part_size = Calamares::Partition::PartitionSize( efiRecommendedSize ); Calamares::Partition::PartitionSize part_size = Calamares::Partition::PartitionSize( efiMinimumSize );
if ( part_size.isValid() ) if ( part_size.isValid() )
{ {
gs->insert( PartUtils::efiFilesystemMinimumSizeGSKey(), part_size.toBytes() ); gs->insert( PartUtils::efiFilesystemMinimumSizeGSKey(), part_size.toBytes() );

5
src/modules/partition/tests/ConfigTests.cpp
View File

@ -152,6 +152,11 @@ ConfigTests::testAll()
QVERIFY( ok ); QVERIFY( ok );
QVERIFY( PartUtils::efiFilesystemRecommendedSizeGSKey() != PartUtils::efiFilesystemMinimumSizeGSKey() );
QCOMPARE( gs->value( PartUtils::efiFilesystemRecommendedSizeGSKey() ).toString(),
QStringLiteral( "83886080" ) );
QCOMPARE( gs->value( PartUtils::efiFilesystemMinimumSizeGSKey() ).toString(), QStringLiteral( "68157440" ) );
QCOMPARE( PartUtils::efiFilesystemRecommendedSize(), 80_MiB ); // From config QCOMPARE( PartUtils::efiFilesystemRecommendedSize(), 80_MiB ); // From config
QCOMPARE( PartUtils::efiFilesystemMinimumSize(), 65_MiB ); // Taken from config QCOMPARE( PartUtils::efiFilesystemMinimumSize(), 65_MiB ); // Taken from config