From c8614161017104559d224c33a52648e2c317b8e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20He=C4=8Dko?= Date: Tue, 28 Jan 2025 15:08:39 +0100 Subject: [PATCH 56/63] fix(add_upgrade_boot_entry): convert arg list into a tuple (#1313) Convert collected rd.lvm args into a tuple before trying to make a set with one of the elements being the args. As list is not hashable, this causes the actor to crash. --- .../actors/addupgradebootentry/libraries/addupgradebootentry.py | 2 +- .../addupgradebootentry/tests/unit_test_addupgradebootentry.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py b/repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py index b236e39b..981c9401 100644 --- a/repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py +++ b/repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py @@ -303,7 +303,7 @@ def _get_rdlvm_arg_values(): api.current_logger().debug('Collected the following rd.lvm.lv args that are undesired for the squashfs: %s', rd_lvm_values) - return rd_lvm_values + return tuple(rd_lvm_values) def construct_cmdline_args_for_livemode(): diff --git a/repos/system_upgrade/common/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py b/repos/system_upgrade/common/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py index 2f58ba9e..dde18782 100644 --- a/repos/system_upgrade/common/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py +++ b/repos/system_upgrade/common/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py @@ -273,7 +273,7 @@ def test_get_rdlvm_arg_values(monkeypatch): args = addupgradebootentry._get_rdlvm_arg_values() - assert args == ['A', 'B'] + assert args == ('A', 'B') def test_get_device_uuid(monkeypatch): -- 2.48.1