remove deprecated test files: eliminate test_android_setup.py and test_fetch_versions.py related to retired setup_android_tools.py script

Author: allnes

.gitignore

@@ -135,3 +135,4 @@ CLAUDE.md
 experiments/results/
 ovmb_cache
 artifacts
+junit.xml

ovmobilebench/android/__init__.py

@@ -12,4 +12,4 @@
     "ensure_android_tools",
     "export_android_env",
     "verify_installation",
-]
+]

ovmobilebench/android/installer/__init__.py

@@ -6,7 +6,7 @@
 Example:
     >>> from ovmobilebench.android.installer import ensure_android_tools, NdkSpec
     >>> from pathlib import Path
-    >>> 
+    >>>
     >>> result = ensure_android_tools(
     ...     sdk_root=Path("/opt/android-sdk"),
     ...     api=30,
@@ -40,4 +40,4 @@
     "InstallerResult",
     "NdkSpec",
     "Target",
-]
+]

ovmobilebench/android/installer/api.py

@@ -55,7 +55,7 @@ def ensure_android_tools(
         >>> from pathlib import Path
         >>> from ovmobilebench.android.installer.api import ensure_android_tools
         >>> from ovmobilebench.android.installer.types import NdkSpec
-        >>> 
+        >>>
         >>> result = ensure_android_tools(
         ...     sdk_root=Path("/opt/android-sdk"),
         ...     api=30,
@@ -117,7 +117,7 @@ def export_android_env(
     Example:
         >>> from pathlib import Path
         >>> from ovmobilebench.android.installer.api import export_android_env
-        >>> 
+        >>>
         >>> env_vars = export_android_env(
         ...     sdk_root=Path("/opt/android-sdk"),
         ...     ndk_path=Path("/opt/android-sdk/ndk/26.1.10909125"),
@@ -147,7 +147,7 @@ def verify_installation(sdk_root: Path, verbose: bool = False) -> dict:
     Example:
         >>> from pathlib import Path
         >>> from ovmobilebench.android.installer.api import verify_installation
-        >>> 
+        >>>
         >>> status = verify_installation(Path("/opt/android-sdk"))
         >>> print(f"Platform tools: {status['platform_tools']}")
         >>> print(f"NDK versions: {status.get('ndk_versions', [])}")
@@ -167,4 +167,4 @@ def verify_installation(sdk_root: Path, verbose: bool = False) -> dict:
     "NdkSpec",
     "Target",
     "Arch",
-]
+]

ovmobilebench/android/installer/avd.py

@@ -208,12 +208,12 @@ def get_info(self, name: str) -> Optional[dict]:
         """
         try:
             result = self._run_avdmanager(["list", "avd"])
-            
+
             # Parse output to find AVD info
             lines = result.stdout.split("\n")
             avd_info = {}
             in_avd = False
-            
+
             for line in lines:
                 line = line.strip()
                 if f"Name: {name}" in line:
@@ -226,9 +226,9 @@ def get_info(self, name: str) -> Optional[dict]:
                     elif ":" in line:
                         key, value = line.split(":", 1)
                         avd_info[key.strip().lower().replace(" ", "_")] = value.strip()
-            
+
             return avd_info if avd_info else None
-            
+
         except (AvdManagerError, ComponentNotFoundError):
             return None
 
@@ -273,4 +273,4 @@ def __enter__(self):
         return self
 
     def __exit__(self, *args):
-        pass
+        pass

ovmobilebench/android/installer/cli.py

@@ -142,7 +142,7 @@ def setup(
             config_table = Table(show_header=False)
             config_table.add_column("Setting", style="cyan")
             config_table.add_column("Value")
-            
+
             config_table.add_row("SDK Root", str(sdk_root))
             config_table.add_row("API Level", str(api))
             config_table.add_row("Target", target)
@@ -155,12 +155,16 @@ def setup(
             if create_avd:
                 config_table.add_row("AVD", create_avd)
             config_table.add_row("Dry Run", "Yes" if dry_run else "No")
-            
+
             console.print(config_table)
             console.print()
 
         # Run installation
-        with console.status("[bold green]Installing Android tools...") if not verbose else nullcontext():
+        with (
+            console.status("[bold green]Installing Android tools...")
+            if not verbose
+            else nullcontext()
+        ):
             result = ensure_android_tools(
                 sdk_root=sdk_root,
                 api=api,
@@ -185,7 +189,7 @@ def setup(
                 sdk_root=result["sdk_root"],
                 ndk_path=result["ndk_path"],
             )
-            
+
             if export_env and verbose:
                 console.print(f"[green]✓[/green] Environment exported to: {export_env}")
 
@@ -208,6 +212,7 @@ def setup(
         console.print(f"[bold red]Unexpected error:[/bold red] {e}")
         if verbose:
             import traceback
+
             traceback.print_exc()
         sys.exit(1)
 
@@ -236,43 +241,43 @@ def verify(
     """
     try:
         console.print(f"[cyan]Verifying installation at: {sdk_root}[/cyan]\n")
-        
+
         status = verify_installation(sdk_root, verbose=verbose)
-        
+
         # Create status table
         table = Table(title="Installation Status")
         table.add_column("Component", style="cyan")
         table.add_column("Status", style="green")
         table.add_column("Details")
-        
+
         # SDK root
         table.add_row(
             "SDK Root",
             "✓" if status["sdk_root_exists"] else "✗",
             str(sdk_root) if status["sdk_root_exists"] else "Not found",
         )
-        
+
         # Command-line tools
         table.add_row(
             "Command-line Tools",
             "✓" if status["cmdline_tools"] else "✗",
             "Installed" if status["cmdline_tools"] else "Not installed",
         )
-        
+
         # Platform tools
         table.add_row(
             "Platform Tools",
             "✓" if status["platform_tools"] else "✗",
             "Installed" if status["platform_tools"] else "Not installed",
         )
-        
+
         # Emulator
         table.add_row(
             "Emulator",
             "✓" if status["emulator"] else "✗",
             "Installed" if status["emulator"] else "Not installed",
         )
-        
+
         # NDK
         ndk_details = "Not installed"
         if status["ndk"] and status.get("ndk_versions"):
@@ -282,7 +287,7 @@ def verify(
             "✓" if status["ndk"] else "✗",
             ndk_details,
         )
-        
+
         # AVDs
         avd_details = "None"
         if status.get("avds"):
@@ -292,19 +297,19 @@ def verify(
             "✓" if status.get("avds") else "-",
             avd_details,
         )
-        
+
         console.print(table)
-        
+
         # Show installed components if verbose
         if verbose and status.get("components"):
             console.print("\n[bold]Installed Components:[/bold]")
             for component in status["components"]:
                 console.print(f"  • {component}")
-        
+
         # Exit code based on status
         if not status["sdk_root_exists"]:
             sys.exit(1)
-            
+
     except Exception as e:
         console.print(f"[bold red]Error:[/bold red] {e}")
         sys.exit(1)
@@ -317,9 +322,9 @@ def list_targets() -> None:
     Shows all supported combinations for system images.
     """
     from .plan import Planner
-    
+
     console.print("[bold]Supported System Image Combinations:[/bold]\n")
-    
+
     # Group by API level
     combinations: Dict[int, Dict[str, list]] = {}
     for api, target, arch in Planner.VALID_COMBINATIONS:
@@ -328,29 +333,31 @@ def list_targets() -> None:
         if target not in combinations[api]:
             combinations[api][target] = []
         combinations[api][target].append(arch)
-    
+
     # Display as table
     for api in sorted(combinations.keys(), reverse=True):
         table = Table(title=f"API Level {api}")
         table.add_column("Target", style="cyan")
         table.add_column("Architectures")
-        
+
         for target in sorted(combinations[api].keys()):
             archs = ", ".join(sorted(combinations[api][target]))
             table.add_row(target, archs)
-        
+
         console.print(table)
         console.print()
 
 
 # Context manager for when console status is not needed
 class nullcontext:
     """Null context manager."""
+
     def __enter__(self):
         return self
+
     def __exit__(self, *args):
         pass
 
 
 if __name__ == "__main__":
-    app()
+    app()

ovmobilebench/android/installer/core.py

@@ -143,7 +143,7 @@ def ensure(
             if plan.need_cmdline_tools:
                 self.sdk.ensure_cmdline_tools()
                 performed["cmdline_tools"] = True
-            
+
             self.sdk.accept_licenses()
             performed["licenses_accepted"] = True
 
@@ -209,7 +209,7 @@ def _check_permissions(self) -> None:
         # Create SDK root if it doesn't exist
         try:
             self.sdk_root.mkdir(parents=True, exist_ok=True)
-            
+
             # Try to create a test file
             test_file = self.sdk_root / ".permission_test"
             test_file.touch()
@@ -248,6 +248,7 @@ def cleanup(self, remove_downloads: bool = True, remove_temp: bool = True) -> No
                     if self.logger:
                         self.logger.debug(f"Removing directory: {temp_dir.name}")
                     import shutil
+
                     shutil.rmtree(temp_dir)
                     cleanup_count += 1
 
@@ -294,13 +295,11 @@ def verify(self) -> dict:
 
         # List installed components
         try:
-            results["components"] = [
-                comp.package_id for comp in self.sdk.list_installed()
-            ]
+            results["components"] = [comp.package_id for comp in self.sdk.list_installed()]
         except Exception:
             results["components"] = []
 
         if self.logger:
             self.logger.info("Verification complete", results=results)
 
-        return results
+        return results

ovmobilebench/android/installer/detect.py

@@ -218,4 +218,4 @@ def get_recommended_settings(host: Optional[HostInfo] = None) -> dict:
         settings["target"] = "google_atd"  # Optimized for testing
         settings["install_emulator"] = True
 
-    return settings
+    return settings

ovmobilebench/android/installer/env.py

@@ -245,4 +245,4 @@ def export_android_env(
         print_stdout=print_stdout,
         sdk_root=sdk_root,
         ndk_path=ndk_path,
-    )
+    )

ovmobilebench/android/installer/errors.py

@@ -48,9 +48,7 @@ class SdkManagerError(InstallerError):
     def __init__(self, command: str, exit_code: int, stderr: str):
         """Initialize with command details."""
         message = f"sdkmanager failed with exit code {exit_code}: {stderr}"
-        super().__init__(
-            message, {"command": command, "exit_code": exit_code, "stderr": stderr}
-        )
+        super().__init__(message, {"command": command, "exit_code": exit_code, "stderr": stderr})
 
 
 class AvdManagerError(InstallerError):
@@ -59,9 +57,7 @@ class AvdManagerError(InstallerError):
     def __init__(self, operation: str, avd_name: str, reason: str):
         """Initialize with AVD operation details."""
         message = f"AVD {operation} failed for '{avd_name}': {reason}"
-        super().__init__(
-            message, {"operation": operation, "avd_name": avd_name, "reason": reason}
-        )
+        super().__init__(message, {"operation": operation, "avd_name": avd_name, "reason": reason})
 
 
 class PermissionError(InstallerError):
@@ -82,7 +78,8 @@ def __init__(self, component: str, search_path: Optional[Path] = None):
         if search_path:
             message += f" in {search_path}"
         super().__init__(
-            message, {"component": component, "search_path": str(search_path) if search_path else None}
+            message,
+            {"component": component, "search_path": str(search_path) if search_path else None},
         )
 
 
@@ -98,7 +95,12 @@ def __init__(self, platform: str, operation: str):
 class DependencyError(InstallerError):
     """Missing or incompatible dependency."""
 
-    def __init__(self, dependency: str, required_version: Optional[str] = None, found_version: Optional[str] = None):
+    def __init__(
+        self,
+        dependency: str,
+        required_version: Optional[str] = None,
+        found_version: Optional[str] = None,
+    ):
         """Initialize with dependency details."""
         message = f"Dependency '{dependency}' "
         if required_version and found_version:
@@ -143,4 +145,4 @@ def __init__(self, operation: str, reason: str, proxy_hint: bool = False):
             message += "\nHint: Check proxy settings or network connectivity"
         super().__init__(
             message, {"operation": operation, "reason": reason, "proxy_hint": proxy_hint}
-        )
+        )