From 6d9ff77e4b2eed8ab1c64d748b3e81732c477a3b Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 6 Oct 2026 18:39:38 -0700 Subject: [PATCH] storage: tests: Fix a failure from psutil change (Closes: #1149418) Tests: - On unstable container, the test fails before the patch and passes after. - On stable, testing, and unstable containers, unit tests pass. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- freedombox/modules/storage/tests/test_storage.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/freedombox/modules/storage/tests/test_storage.py b/freedombox/modules/storage/tests/test_storage.py index 5557db2fc..6d328b335 100644 --- a/freedombox/modules/storage/tests/test_storage.py +++ b/freedombox/modules/storage/tests/test_storage.py @@ -380,17 +380,16 @@ def test_is_partition_read_only(disk_partitions): def partition(*args): try: - # psutil <= 5.9.8 - # pylint: disable=protected-access - return psutil._common.sdiskpart(*args) - except TypeError: # psutil >= 7.0 - return psutil._common.sdiskpart(*args[:-2]) + return psutil._common.sdiskpart(*args) + except AttributeError: + # psutil >= 7.2 + return psutil._ntuples.sdiskpart(*args) disk_partitions.return_value = [ - partition('/dev/root', '/', 'btrfs', 'rw,nosuid', 42, 42), - partition('/dev/root', '/foo', 'btrfs', 'rw', 321, 321), - partition('/dev/foo', '/bar', 'extfs', 'ro', 123, 123) + partition('/dev/root', '/', 'btrfs', 'rw,nosuid'), + partition('/dev/root', '/foo', 'btrfs', 'rw'), + partition('/dev/foo', '/bar', 'extfs', 'ro') ] assert not storage.is_partition_read_only('/') assert not storage.is_partition_read_only('/foo')