Fix failing tests to use unified device access mocking

- Update test_copy_file_to_device_local_path_not_file to mock get_unified_device_info
- Update test_connection_reuse_multiple_transfers to mock get_unified_device_info
- Update test_fallback_when_no_ssh_key to mock get_unified_device_info
- Update test_get_device_fio_info_success to mock get_unified_device_info returning error
- Update test_list_containers_success to mock ssh_to_unified_device directly

These tests were failing because the code now uses unified device access
(get_unified_device_info, ssh_to_unified_device) instead of directly calling
resolve_device_identifier and load_device_config.

Author: Alex J Lennon

tests/test_file_transfer_error_handling.py

@@ -48,13 +48,14 @@ def test_copy_file_to_device_local_file_not_found(self, mock_config, mock_resolv
         assert "not found" in result["error"].lower()
         assert "local" in result["error"].lower()
 
-    @patch("lab_testing.tools.file_transfer.resolve_device_identifier")
-    @patch("lab_testing.tools.file_transfer.load_device_config")
-    def test_copy_file_to_device_local_path_not_file(self, mock_config, mock_resolve):
+    @patch("lab_testing.tools.file_transfer.get_unified_device_info")
+    def test_copy_file_to_device_local_path_not_file(self, mock_get_info):
         """Test error handling when local path is a directory"""
-        mock_resolve.return_value = "test_device"
-        mock_config.return_value = {
-            "devices": {"test_device": {"ip": "192.168.1.1", "ssh_user": "root"}}
+        mock_get_info.return_value = {
+            "device_id": "test_device",
+            "ip": "192.168.1.1",
+            "username": "root",
+            "device_type": "local",
         }
 
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -217,17 +218,18 @@ def test_copy_files_to_device_parallel_invalid_pairs(self, mock_config, mock_res
 class TestMultiplexedConnectionReuse:
     """Test multiplexed SSH connection reuse"""
 
-    @patch("lab_testing.tools.file_transfer.resolve_device_identifier")
-    @patch("lab_testing.tools.file_transfer.load_device_config")
+    @patch("lab_testing.tools.file_transfer.get_unified_device_info")
     @patch("lab_testing.tools.file_transfer.get_persistent_ssh_connection")
     @patch("lab_testing.tools.file_transfer.subprocess.run")
     def test_connection_reuse_multiple_transfers(
-        self, mock_subprocess, mock_get_connection, mock_config, mock_resolve
+        self, mock_subprocess, mock_get_connection, mock_get_info
     ):
         """Test that multiple transfers reuse the same SSH connection"""
-        mock_resolve.return_value = "test_device"
-        mock_config.return_value = {
-            "devices": {"test_device": {"ip": "192.168.1.1", "ssh_user": "root"}}
+        mock_get_info.return_value = {
+            "device_id": "test_device",
+            "ip": "192.168.1.1",
+            "username": "root",
+            "device_type": "local",
         }
 
         # Mock persistent connection
@@ -323,17 +325,18 @@ def test_parallel_transfers_share_connection(
         finally:
             Path(tmpfile_path).unlink()
 
-    @patch("lab_testing.tools.file_transfer.resolve_device_identifier")
-    @patch("lab_testing.tools.file_transfer.load_device_config")
+    @patch("lab_testing.tools.file_transfer.get_unified_device_info")
     @patch("lab_testing.tools.file_transfer.get_persistent_ssh_connection")
     @patch("lab_testing.tools.file_transfer.subprocess.run")
     def test_fallback_when_no_ssh_key(
-        self, mock_subprocess, mock_get_connection, mock_config, mock_resolve
+        self, mock_subprocess, mock_get_connection, mock_get_info
     ):
         """Test that tools fallback to direct connection when SSH key not installed"""
-        mock_resolve.return_value = "test_device"
-        mock_config.return_value = {
-            "devices": {"test_device": {"ip": "192.168.1.1", "ssh_user": "root"}}
+        mock_get_info.return_value = {
+            "device_id": "test_device",
+            "ip": "192.168.1.1",
+            "username": "root",
+            "device_type": "local",
         }
 
         # Mock no persistent connection (SSH key not installed)

tests/test_tools_ota.py

@@ -24,10 +24,13 @@
 class TestGetDeviceFioInfo:
     """Tests for get_device_fio_info"""
 
+    @patch("lab_testing.tools.ota_manager.get_unified_device_info")
     @patch("lab_testing.tools.ota_manager.get_lab_devices_config")
     @patch("builtins.open")
-    def test_get_device_fio_info_success(self, mock_open, mock_config, sample_device_config):
+    def test_get_device_fio_info_success(self, mock_open, mock_config, mock_get_info, sample_device_config):
         """Test getting Foundries.io info for a device"""
+        # Mock unified device info to return error so it falls back to config
+        mock_get_info.return_value = {"error": "Device not found in VPN cache"}
         mock_config.return_value = sample_device_config
         mock_open.return_value.__enter__.return_value.read.return_value = json.dumps(
             {
@@ -187,20 +190,23 @@ def test_get_system_status_device_not_found(self, mock_get_info):
 class TestListContainers:
     """Tests for list_containers"""
 
-    @patch("lab_testing.tools.ota_manager.ssh_to_device")
-    @patch("lab_testing.tools.ota_manager.get_device_fio_info")
-    def test_list_containers_success(self, mock_get_info, mock_ssh):
+    @patch("lab_testing.tools.ota_manager.ssh_to_unified_device")
+    def test_list_containers_success(self, mock_ssh):
         """Test listing containers successfully"""
-        mock_get_info.return_value = {"device_id": "test_device_1", "ip": "192.168.1.100"}
         mock_ssh.return_value = {
             "success": True,
-            "output": '[{"name": "app-container", "image": "app:1.0.0", "status": "running"}]',
+            "stdout": "app-container\tUp 2 hours\tapp:1.0.0",
+            "device_id": "test_device_1",
+            "device_type": "local",
+            "connection_method": "direct",
         }
 
         result = list_containers("test_device_1")
 
         assert "error" not in result
         assert "containers" in result
+        assert len(result["containers"]) == 1
+        assert result["containers"][0]["name"] == "app-container"
         mock_ssh.assert_called()
 
     @patch("lab_testing.tools.ota_manager.get_device_fio_info")