fix(upload): avoid advancing step on validation mismatch

Author: yashhzd

ardupilot_methodic_configurator/data_model_parameter_editor.py

@@ -1050,9 +1050,8 @@ def upload_selected_params_workflow(  # pylint: disable=too-many-arguments, too-
                     )
                     if should_retry:
                         continue
-                    # If not retrying, continue without success message
-                else:
-                    logging_info(_("All parameters uploaded to the flight controller successfully"))
+                    return
+                logging_info(_("All parameters uploaded to the flight controller successfully"))
 
                 if self._should_export_fc_params_diff:
                     self._export_fc_params_missing_or_different()

tests/test_data_model_parameter_editor.py

@@ -3774,18 +3774,20 @@ def test_system_prompts_retry_when_parameter_validation_finds_mismatch(self, par
         GIVEN: Parameters that were uploaded but their values are mismatched after re-download
         WHEN: upload_selected_params_workflow is called
         THEN: The ask_retry_cancel callback is invoked exactly once with a descriptive message
+        AND: The current step is not marked as successfully uploaded when the user cancels
         """
         # Arrange: FC value differs from what was uploaded so validation will fail
         parameter_editor._flight_controller.fc_parameters = {"P1": 1.0}
 
         mock_retry = MagicMock(return_value=False)  # User chooses not to retry
+        mock_write = MagicMock()
 
         with patch.multiple(
             parameter_editor,
             upload_parameters_that_require_reset_workflow=MagicMock(return_value=(False, {})),
             _upload_parameters_to_fc=MagicMock(return_value=1),
             download_flight_controller_parameters=MagicMock(),
-            _write_current_file=MagicMock(),
+            _write_current_file=mock_write,
             _export_fc_params_missing_or_different=MagicMock(),
             _validate_uploaded_parameters=MagicMock(return_value=["P1"]),
         ):
@@ -3799,6 +3801,8 @@ def test_system_prompts_retry_when_parameter_validation_finds_mismatch(self, par
 
         # Assert: retry dialog was presented exactly once
         mock_retry.assert_called_once()
+        mock_write.assert_not_called()
+        assert parameter_editor._at_least_one_changed is True
 
     @pytest.mark.parametrize(
         ("fc_val", "upload_val", "expect_mismatch"),