fix(connection-selection): consistency fixes

Author: amilcarlucas

ardupilot_methodic_configurator/frontend_tkinter_connection_selection.py

@@ -80,8 +80,9 @@ def __init__(  # pylint: disable=too-many-arguments, too-many-positional-argumen
         # Load saved connection history from ProgramSettings and cache it to avoid
         # repeated disk reads on every periodic port-refresh cycle.
         self._connection_history_cache: list[str] = ProgramSettings.get_connection_history()
-        for conn in self._connection_history_cache:
-            self.flight_controller.add_connection(conn)
+        # Perform an initial connection discovery using the cached history so the
+        # combobox starts from the same source-of-truth list that refresh uses.
+        self.flight_controller.discover_connections(preserved_connections=self._connection_history_cache)
 
         # Create a read-only combobox for flight controller connection selection
         self.conn_selection_combobox = PairTupleCombobox(

tests/test_backend_flightcontroller_connection.py

@@ -483,9 +483,9 @@ def test_preserved_connection_survives_port_rediscovery(self) -> None:
         GIVEN: User has previously used a custom connection (e.g. a TCP address stored in history)
         WHEN: discover_connections() is called again (periodic 3s refresh) and returns different ports
             AND the caller supplies the history list as preserved_connections
-        THEN: The preserved connection should still be present in the combobox
-        AND: Auto-discovered ports that disappeared should be gone
-        AND: Newly auto-discovered ports should appear
+        THEN: The preserved connection should still be present in the available connections list/tuples
+        AND: Auto-discovered ports that disappeared should be gone from the available connections list/tuples
+        AND: Newly auto-discovered ports should appear in the available connections list/tuples
         """
         # Given: Connection manager with a mocked serial port discovery
         mock_discovery = Mock()

tests/test_frontend_tkinter_connection_selection.py

@@ -804,8 +804,8 @@ def test_periodic_refresh_starts_on_init(
         AND: root.after should have been called to schedule the next recurring refresh
         AND: The widget should not be in a refreshing state after initialization completes
         """
-        periodic_widget._mock_fc.discover_connections.assert_called_once_with(  # type: ignore[attr-defined]
-            progress_callback=None, preserved_connections=[]
+        periodic_widget._mock_fc.discover_connections.assert_any_call(  # type: ignore[attr-defined]
+            preserved_connections=[]
         )
         mock_parent.root.after.assert_called_with(3000, periodic_widget._refresh_ports)
         assert periodic_widget._is_refreshing is False
@@ -1004,12 +1004,12 @@ def test_history_cache_is_populated_from_program_settings_on_startup(self) -> No
 
     def test_stored_connections_are_registered_with_flight_controller_on_init(self) -> None:
         """
-        Each connection in the loaded history is registered with the flight controller.
+        History connections are passed to discover_connections on init.
 
         GIVEN: ProgramSettings holds two previously used connections
         WHEN: ConnectionSelectionWidgets is initialized
-        THEN: flight_controller.add_connection should have been called once per stored entry
-        AND: Each call should use the exact stored connection string
+        THEN: flight_controller.discover_connections should have been called with preserved_connections
+        AND: The preserved_connections should contain each stored entry
         """
         history = ["COM1", "tcp:127.0.0.1:5761"]
         mock_parent = MagicMock()
@@ -1036,9 +1036,8 @@ def test_stored_connections_are_registered_with_flight_controller_on_init(self)
                 download_params_on_connect=False,
             )
 
-        calls = [call[0][0] for call in mock_fc.add_connection.call_args_list]
-        assert "COM1" in calls
-        assert "tcp:127.0.0.1:5761" in calls
+        mock_fc.discover_connections.assert_any_call(preserved_connections=history)
+        mock_fc.add_connection.assert_not_called()
 
     def test_history_cache_is_empty_when_settings_has_no_stored_connections(self) -> None:
         """
@@ -1162,7 +1161,7 @@ def test_persist_and_cache_deduplicates_existing_matching_cache_entry(
         self, persist_widget: tuple[ConnectionSelectionWidgets, MagicMock, MagicMock]
     ) -> None:
         """
-        _persist_and_cache_connection removes the old occurrence of a re-used connection.
+        _persist_and_cache_connection removes the old occurrence of a reused connection.
 
         GIVEN: The cache already contains "COM3" at position 2
         WHEN: "COM3" is persisted again (user reconnects to a previous device)