update tests: enhance mock usage and fix integration tests for Android installer

- Mock license acceptance to avoid actual `sdkmanager` calls and refine AVD creation flow.
- Improve validation in NDK-related test cases, including TAR & DMG handling.
- Adjust `_get_download_url` logic with refined mocks for accurate URL construction.
- Simplify `resolve_path` and environment variable-dependent tests to align with actual implementation.
- Remove obsolete test cases, re-enable resolved entries in `skip_list.txt`, and consolidate edge case coverage.

Author: allnes

ovmobilebench/android/installer/detect.py

@@ -119,7 +119,7 @@ def get_ndk_filename(version: str) -> str:
     if host.os == "windows":
         return f"android-ndk-{version}-windows.zip"
     elif host.os == "darwin":
-        return f"android-ndk-{version}-darwin.dmg"
+        return f"android-ndk-{version}-darwin.zip"
     else:
         return f"android-ndk-{version}-linux.zip"
 

ovmobilebench/packaging/packager.py

@@ -20,10 +20,12 @@ def __init__(
         config: PackageConfig,
         models: list[ModelItem],
         output_dir: Path,
+        android_abi: str = "arm64-v8a",
     ):
         self.config = config
         self.models = models
         self.output_dir = ensure_dir(output_dir)
+        self.android_abi = android_abi
 
     def create_bundle(
         self,
@@ -111,21 +113,33 @@ def _copy_ndk_stl_lib(self, dest_dir: Path):
             logger.warning("Android NDK not found, libc++_shared.so will not be included")
             return
 
-        # Find libc++_shared.so for aarch64
+        # Map Android ABI to NDK arch directory name
+        abi_to_arch = {
+            "arm64-v8a": "aarch64-linux-android",
+            "armeabi-v7a": "arm-linux-androideabi",
+            "x86": "i686-linux-android",
+            "x86_64": "x86_64-linux-android",
+        }
+
+        arch_dir = abi_to_arch.get(self.android_abi, "aarch64-linux-android")
+
+        # Find libc++_shared.so for the target architecture
         stl_paths = [
             ndk_root
-            / "toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so",
+            / f"toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/{arch_dir}/libc++_shared.so",
+            ndk_root
+            / f"toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/{arch_dir}/libc++_shared.so",
             ndk_root
-            / "toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so",
+            / f"toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/lib/{arch_dir}/libc++_shared.so",
         ]
 
         for stl_path in stl_paths:
             if stl_path.exists():
                 shutil.copy2(stl_path, dest_dir / "libc++_shared.so")
-                logger.info("Copied libc++_shared.so from Android NDK")
+                logger.info(f"Copied libc++_shared.so for {self.android_abi} from Android NDK")
                 return
 
-        logger.warning("libc++_shared.so not found in Android NDK")
+        logger.warning(f"libc++_shared.so not found in Android NDK for {self.android_abi}")
 
     def _copy_models(self, models_dir: Path):
         """Copy model files."""

ovmobilebench/pipeline.py

@@ -93,10 +93,16 @@ def package(self) -> Path | None:
             artifacts = self._get_install_artifacts(download_dir)
 
         # Create package
+        # Get Android ABI from openvino config if available
+        android_abi = "arm64-v8a"  # default
+        if hasattr(self.config, "openvino") and hasattr(self.config.openvino, "toolchain"):
+            android_abi = getattr(self.config.openvino.toolchain, "abi", "arm64-v8a")
+
         packager = Packager(
             self.config.package,
             self.config.get_model_list(),
             self.artifacts_dir / "packages",
+            android_abi=android_abi,
         )
 
         bundle_name = f"ovbundle_{self.config.project.run_id}"

tests/android/installer/test_detect.py

@@ -162,7 +162,7 @@ def test_get_ndk_filename_macos(self, mock_detect):
         """Test getting NDK filename for macOS."""
         mock_detect.return_value = Mock(os="darwin")
         filename = get_ndk_filename("r26d")
-        assert filename == "android-ndk-r26d-darwin.dmg"
+        assert filename == "android-ndk-r26d-darwin.zip"
 
     @patch("ovmobilebench.android.installer.detect.detect_host")
     def test_get_ndk_filename_windows(self, mock_detect):

tests/android/installer/test_integration.py

@@ -56,22 +56,26 @@ def test_full_installation_flow(self, mock_check_disk, mock_detect_host, mock_su
 
         installer = AndroidInstaller(self.sdk_root)
 
-        # Mock AVD creation
-        with patch.object(installer.avd, "create") as mock_avd_create:
-            mock_avd_create.return_value = True
+        # Mock license acceptance to avoid actual sdkmanager call
+        with patch.object(installer.sdk, "accept_licenses") as mock_accept:
+            mock_accept.return_value = None
 
-            result = installer.ensure(
-                api=30,
-                target="google_atd",
-                arch="arm64-v8a",
-                ndk=NdkSpec(alias="r26d"),
-                create_avd_name="test_avd",
-                dry_run=False,
-            )
+            # Mock AVD creation
+            with patch.object(installer.avd, "create") as mock_avd_create:
+                mock_avd_create.return_value = True
 
-            assert isinstance(result, dict)
-            assert result["sdk_root"] == self.sdk_root
-            assert result["avd_created"] is True
+                result = installer.ensure(
+                    api=30,
+                    target="google_atd",
+                    arch="arm64-v8a",
+                    ndk=NdkSpec(alias="r26d"),
+                    create_avd_name="test_avd",
+                    dry_run=False,
+                )
+
+                assert isinstance(result, dict)
+                assert result["sdk_root"] == self.sdk_root
+                assert result["avd_created"] is True
 
     @patch("subprocess.run")
     @patch("ovmobilebench.android.installer.detect.detect_host")
@@ -288,44 +292,48 @@ def test_concurrent_component_installation(
 
         installer = AndroidInstaller(self.sdk_root)
 
-        # Mock multiple components needing installation
-        with patch.object(installer.sdk, "ensure_platform_tools") as mock_platform:
-            with patch.object(installer.sdk, "ensure_emulator") as mock_emulator:
-                with patch.object(installer.sdk, "ensure_build_tools") as mock_build:
-                    with patch.object(installer.ndk, "ensure") as mock_ndk:
-                        # Create cmdline tools and mock components first
-                        self._create_cmdline_tools()
-
-                        # Create the directories that would be created
-                        (self.sdk_root / "platforms" / "android-30").mkdir(parents=True)
-                        (
-                            self.sdk_root
-                            / "system-images"
-                            / "android-30"
-                            / "google_atd"
-                            / "arm64-v8a"
-                        ).mkdir(parents=True)
-                        (self.sdk_root / "cmake" / "3.22.1").mkdir(parents=True)
-
-                        # Set up return values
-                        mock_platform.return_value = self.sdk_root / "platform-tools"
-                        mock_emulator.return_value = self.sdk_root / "emulator"
-                        mock_build.return_value = self.sdk_root / "build-tools" / "34.0.0"
-                        mock_ndk.return_value = self.sdk_root / "ndk" / "26.3.11579264"
-
-                        installer.ensure(
-                            api=30,
-                            target="google_atd",
-                            arch="arm64-v8a",
-                            ndk=NdkSpec(alias="r26d"),
-                            install_build_tools="34.0.0",
-                            dry_run=False,
-                        )
-
-                        # All should be called
-                        mock_platform.assert_called_once()
-                        mock_emulator.assert_called_once()
-                        mock_build.assert_called_once_with("34.0.0")
+        # Mock license acceptance to avoid actual sdkmanager call
+        with patch.object(installer.sdk, "accept_licenses") as mock_accept:
+            mock_accept.return_value = None
+
+            # Mock multiple components needing installation
+            with patch.object(installer.sdk, "ensure_platform_tools") as mock_platform:
+                with patch.object(installer.sdk, "ensure_emulator") as mock_emulator:
+                    with patch.object(installer.sdk, "ensure_build_tools") as mock_build:
+                        with patch.object(installer.ndk, "ensure") as mock_ndk:
+                            # Create cmdline tools and mock components first
+                            self._create_cmdline_tools()
+
+                            # Create the directories that would be created
+                            (self.sdk_root / "platforms" / "android-30").mkdir(parents=True)
+                            (
+                                self.sdk_root
+                                / "system-images"
+                                / "android-30"
+                                / "google_atd"
+                                / "arm64-v8a"
+                            ).mkdir(parents=True)
+                            (self.sdk_root / "cmake" / "3.22.1").mkdir(parents=True)
+
+                            # Set up return values
+                            mock_platform.return_value = self.sdk_root / "platform-tools"
+                            mock_emulator.return_value = self.sdk_root / "emulator"
+                            mock_build.return_value = self.sdk_root / "build-tools" / "34.0.0"
+                            mock_ndk.return_value = self.sdk_root / "ndk" / "26.3.11579264"
+
+                            installer.ensure(
+                                api=30,
+                                target="google_atd",
+                                arch="arm64-v8a",
+                                ndk=NdkSpec(alias="r26d"),
+                                install_build_tools="34.0.0",
+                                dry_run=False,
+                            )
+
+                            # All should be called
+                            mock_platform.assert_called_once()
+                            mock_emulator.assert_called_once()
+                            mock_build.assert_called_once_with("34.0.0")
 
     # Helper methods to create mock components