Skip to content

Commit c8825fb

Browse files
OmkarSarkar204amilcarlucas
authored andcommitted
fix: correct error message in directory removal
Signed-off-by: Omkar Sarkar <omkarsarkar24@gmail.com> fix: CI test fix
1 parent 1f2ce01 commit c8825fb

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

ardupilot_methodic_configurator/backend_filesystem.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,11 +685,11 @@ def _transform_param_dict(
685685
param.value = new_value
686686

687687
def remove_created_files_and_vehicle_dir(self) -> str:
688-
# Remove the created files in the new vehicle directory
688+
# Remove the created files and the vehicle directory itself
689689
try:
690690
if not os_path.exists(self.vehicle_dir):
691691
# Use the actual vehicle_dir value to avoid KeyError from missing format keys
692-
error_msg = _("New vehicle directory does not exist: {vehicle_dir}")
692+
error_msg = _("Vehicle directory to remove does not exist: {vehicle_dir}")
693693
error_msg = error_msg.format(vehicle_dir=self.vehicle_dir)
694694
logging_error(error_msg)
695695
return error_msg

tests/test_backend_filesystem.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ def test_remove_created_files_and_vehicle_dir_not_exists(self) -> None:
158158
patch("ardupilot_methodic_configurator.backend_filesystem.os_listdir") as mock_listdir,
159159
):
160160
ret = filesystem.remove_created_files_and_vehicle_dir()
161-
# Should return a non-empty error message mentioning the new vehicle directory
161+
# Should return a non-empty error message mentioning the removed vehicle directory
162162
assert isinstance(ret, str)
163-
assert "New vehicle directory does not exist" in ret
163+
assert "Vehicle directory to remove does not exist" in ret
164164
# listdir must not have been called when directory doesn't exist
165165
assert not mock_listdir.called
166166
mock_exists.assert_called()

0 commit comments

Comments
 (0)