From 119c730eb6b096f646801366184b575efbf64d8b Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Tue, 8 Jul 2025 13:08:00 +0200
Subject: [PATCH] tests: Change expected Stratis metadata size for stratisd
 3.7.0

Resolves: RHEL-102299
---
 ...hange-expected-Stratis-metadata-size.patch | 36 +++++++++++++++++++
 python-blivet.spec                            |  7 +++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 0022-Change-expected-Stratis-metadata-size.patch

diff --git a/0022-Change-expected-Stratis-metadata-size.patch b/0022-Change-expected-Stratis-metadata-size.patch
new file mode 100644
index 0000000..93cbef1
--- /dev/null
+++ b/0022-Change-expected-Stratis-metadata-size.patch
@@ -0,0 +1,36 @@
+From e5ad3beb216d25a601d8f35c2b2a97d15cbb0d39 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Tue, 3 Sep 2024 10:40:27 +0200
+Subject: [PATCH] tests: Change expected Stratis metadata size for stratisd
+ 3.7.0
+
+Stratis changes its metadata and the way "stratis-predict-usage"
+predicts its size so we need to change our expectations too.
+
+Resolves: RHEL-102299
+---
+ tests/unit_tests/devicefactory_test.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/unit_tests/devicefactory_test.py b/tests/unit_tests/devicefactory_test.py
+index 0a5e6a839..89ca34a33 100644
+--- a/tests/unit_tests/devicefactory_test.py
++++ b/tests/unit_tests/devicefactory_test.py
+@@ -942,7 +942,7 @@ def _get_size_delta(self, devices=None):
+             :keyword devices: list of factory-managed devices or None
+             :type devices: list(:class:`blivet.devices.StorageDevice`) or NoneType
+         """
+-        return Size("550 MiB")  # huge stratis pool metadata
++        return Size("1.3 GiB")  # huge stratis pool metadata
+ 
+     def _validate_factory_device(self, *args, **kwargs):
+         device = args[0]
+@@ -968,7 +968,7 @@ def _validate_factory_device(self, *args, **kwargs):
+         else:
+             self.assertAlmostEqual(device.pool.size,
+                                    device.size,
+-                                   delta=Size("600 MiB"))
++                                   delta=Size("1.3 GiB"))
+ 
+         self.assertEqual(device.pool.encrypted, kwargs.get("container_encrypted", False))
+ 
diff --git a/python-blivet.spec b/python-blivet.spec
index 697f222..5ae08a5 100644
--- a/python-blivet.spec
+++ b/python-blivet.spec
@@ -5,7 +5,7 @@ Version: 3.10.0
 
 #%%global prerelease .b2
 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2
-Release: 21%{?prerelease}%{?dist}
+Release: 22%{?prerelease}%{?dist}
 Epoch: 1
 License: LGPL-2.1-or-later
 %global realname blivet
@@ -36,6 +36,7 @@ Patch16: 0018-Include-additional-information-in-PartitioningError.patch
 Patch17: 0019-Make-ActionDestroyFormat-optional.patch
 Patch18: 0020-Wipe-end-partition-before-creating-it-as-well-as-the-start.patch
 Patch19: 0021-Tell-LVM-DBus-to-refresh-its-internal-status-during-reset.patch
+Patch20: 0022-Change-expected-Stratis-metadata-size.patch
 
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
@@ -130,6 +131,10 @@ make DESTDIR=%{buildroot} install
 %{python3_sitelib}/*
 
 %changelog
+* Tue Jul 8 2025 Vojtech Trefny <vtrefny@redhat.com> - 3.10.0-22
+- tests: Change expected Stratis metadata size for stratisd 3.7.0
+  Resolves: RHEL-102299
+
 * Tue Jul 01 2025 Vojtech Trefny <vtrefny@redhat.com> - 3.10.0-21
 - Tell LVM DBus to refresh it's internal status during reset
   Resolves: RHEL-93967