nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-10-18 07:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: tests: Fix a failure from psutil change (Closes: #1149418)

Browse Source 
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 <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2026-10-06 18:39:38 -07:00 committed by James Valleroy
parent 49acf4fb5c
commit 6d9ff77e4b
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
freedombox/modules/storage/tests/test_storage.py
View File

@ -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')