[partition] Extend test, fix bug indicated by test

Copy-paste-o, was using wrong string value for minimum size, found by failing unit test.
koompi · Nov 12, 2023 · 3e758d2 · 3e758d2
1 parent 45c1113
commit 3e758d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp
@@ -317,7 +317,7 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu
         const auto efiMinimumSize = Calamares::getString( efiConfiguration, "minimumSize" );
         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() )
             {
                 gs->insert( PartUtils::efiFilesystemMinimumSizeGSKey(), part_size.toBytes() );

diff --git a/src/modules/partition/tests/ConfigTests.cpp b/src/modules/partition/tests/ConfigTests.cpp
@@ -152,6 +152,11 @@ ConfigTests::testAll()
 
         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::efiFilesystemMinimumSize(), 65_MiB );  // Taken from config