From 3e758d2d5c63e63cc1638dcef61054b59b5f73c0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 13 Nov 2023 00:37:03 +0100
Subject: [PATCH] [partition] Extend test, fix bug indicated by test
Copy-paste-o, was using wrong string value for minimum size,
found by failing unit test.
---
src/modules/partition/Config.cpp | 2 +-
src/modules/partition/tests/ConfigTests.cpp | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp
index 31d7ff56ca..0962e96037 100644
--- 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
index 2500f157ed..7191e0a06c 100644
--- 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
--
GitLab