update tests: set x86_64 as default architecture in Android setup and emulator tests, align with config changes and validation steps

Author: allnes

tests/cli/test_setup_android_config.py

@@ -15,14 +15,20 @@ class TestSetupAndroidWithConfig:
 
     def test_setup_android_reads_config(self, tmp_path):
         """Test that setup-android reads SDK location from config."""
-        # Create a test config
+        # Create a test config with x86_64 architecture
         config_data = {
             "project": {
                 "name": "test",
                 "run_id": "test_001",
                 "cache_dir": str(tmp_path / "test_cache"),
             },
-            "openvino": {"mode": "build"},
+            "openvino": {
+                "mode": "build",
+                "toolchain": {
+                    "abi": "x86_64",  # Specify architecture to match what we check
+                    "api_level": 30,
+                },
+            },
             "device": {"kind": "android", "serials": []},
             "models": [{"name": "model1", "path": "model1.xml"}],
             "report": {"sinks": [{"type": "json", "path": "results.json"}]},
@@ -34,11 +40,11 @@ def test_setup_android_reads_config(self, tmp_path):
 
         with patch("ovmobilebench.android.installer.api.verify_installation") as mock_verify:
             with patch("ovmobilebench.android.installer.api.ensure_android_tools") as mock_ensure:
-                # Mock verification to say everything is installed
+                # Mock verification to say everything is installed (with x86_64)
                 mock_verify.return_value = {
                     "platform_tools": True,
                     "emulator": True,
-                    "system_images": ["system-images;android-30;google_apis;arm64-v8a"],
+                    "system_images": ["system-images;android-30;google_apis;x86_64"],
                     "ndk_versions": ["27.2.12479018"],
                 }
 
@@ -56,14 +62,20 @@ def test_setup_android_reads_config(self, tmp_path):
 
     def test_setup_android_installs_missing_components(self, tmp_path):
         """Test that setup-android installs only missing components."""
-        # Create a test config
+        # Create a test config with x86_64 architecture
         config_data = {
             "project": {
                 "name": "test",
                 "run_id": "test_001",
                 "cache_dir": str(tmp_path / "test_cache"),
             },
-            "openvino": {"mode": "build"},
+            "openvino": {
+                "mode": "build",
+                "toolchain": {
+                    "abi": "x86_64",
+                    "api_level": 30,
+                },
+            },
             "device": {"kind": "android", "serials": []},
             "models": [{"name": "model1", "path": "model1.xml"}],
             "report": {"sinks": [{"type": "json", "path": "results.json"}]},
@@ -79,11 +91,16 @@ def test_setup_android_installs_missing_components(self, tmp_path):
                 mock_verify.return_value = {
                     "platform_tools": True,
                     "emulator": True,
-                    "system_images": ["system-images;android-30;google_apis;arm64-v8a"],
+                    "system_images": ["system-images;android-30;google_apis;x86_64"],
                     "ndk_versions": [],  # NDK missing
                 }
 
-                mock_ensure.return_value = MagicMock(returncode=0)
+                mock_ensure.return_value = {
+                    "sdk_root": str(tmp_path / "test_cache" / "android-sdk"),
+                    "ndk_path": str(
+                        tmp_path / "test_cache" / "android-sdk" / "ndk" / "27.2.12479018"
+                    ),
+                }
 
                 result = runner.invoke(
                     app,

tests/helpers/test_emulator_helper.py

@@ -151,9 +151,14 @@ def test_wait_for_boot_success(self):
         with patch("pathlib.Path.exists", return_value=True):
             # Mock subprocess.run to simulate successful boot
             with patch("subprocess.run") as mock_run:
-                # First call: wait-for-device succeeds
-                # Second call: getprop returns "1" (booted)
+                # Our new implementation makes these calls:
+                # 1. adb devices (initial check)
+                # 2. adb wait-for-device
+                # 3. adb shell getprop sys.boot_completed
                 mock_run.side_effect = [
+                    Mock(
+                        returncode=0, stdout="List of devices attached\nemulator-5554\tdevice\n"
+                    ),  # adb devices
                     Mock(returncode=0),  # wait-for-device
                     Mock(returncode=0, stdout="1\n"),  # getprop sys.boot_completed
                 ]
@@ -162,8 +167,8 @@ def test_wait_for_boot_success(self):
                     result = wait_for_boot(timeout=10)
 
                 assert result is True
-                # Should have called adb at least twice
-                assert mock_run.call_count >= 2
+                # Should have called adb at least 3 times
+                assert mock_run.call_count >= 3
 
     def test_wait_for_boot_timeout(self):
         """Test emulator boot timeout."""