test: add tests for the installer

Author: sfermigier

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ repos:
 
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.14.11'
+  rev: 'v0.14.13'
   hooks:
     - id: ruff
       # Respect `exclude` and `extend-exclude` settings.

packages/hop3-installer/tests/c_e2e/conftest.py

@@ -0,0 +1,202 @@
+# Copyright (c) 2025-2026, Abilian SAS
+# SPDX-License-Identifier: Apache-2.0
+"""E2E test fixtures for installer testing.
+
+These fixtures provide Docker container management for testing the
+hop3-installer scripts in isolation.
+"""
+
+from __future__ import annotations
+
+import subprocess
+import time
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+import pytest
+
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
+# Container configuration
+CONTAINER_NAME = "hop3-installer-test"
+BASE_IMAGE = "ubuntu:24.04"
+
+
+def docker_exec(
+    container: str,
+    cmd: str,
+    *,
+    check: bool = True,
+    user: str | None = None,
+) -> subprocess.CompletedProcess:
+    """Execute command in Docker container.
+
+    Args:
+        container: Container name or ID
+        cmd: Command to execute
+        check: Whether to raise on non-zero exit
+        user: User to run command as (default: root)
+
+    Returns:
+        CompletedProcess with stdout/stderr captured
+    """
+    docker_cmd = ["docker", "exec"]
+    if user:
+        docker_cmd.extend(["-u", user])
+    docker_cmd.extend([container, "bash", "-c", cmd])
+
+    return subprocess.run(
+        docker_cmd,
+        capture_output=True,
+        text=True,
+        check=check,
+    )
+
+
+def docker_copy(container: str, src: Path, dest: str) -> None:
+    """Copy file to Docker container.
+
+    Args:
+        container: Container name or ID
+        src: Local source path
+        dest: Remote destination path
+    """
+    subprocess.run(
+        ["docker", "cp", str(src), f"{container}:{dest}"],
+        check=True,
+    )
+
+
+def docker_copy_dir(container: str, src: Path, dest: str) -> None:
+    """Copy directory to Docker container.
+
+    Args:
+        container: Container name or ID
+        src: Local source directory
+        dest: Remote destination path
+    """
+    subprocess.run(
+        ["docker", "cp", str(src), f"{container}:{dest}"],
+        check=True,
+    )
+    # Fix permissions so all users can read
+    docker_exec(container, f"chmod -R a+rX {dest}", check=False)
+
+
+@pytest.fixture(scope="module")
+def docker_container() -> Generator[str, None, None]:
+    """Create and manage a Docker container for testing.
+
+    This fixture:
+    1. Removes any existing test container
+    2. Starts a fresh Ubuntu container
+    3. Installs Python and prerequisites
+    4. Yields the container name
+    5. Cleans up after tests complete
+
+    Yields:
+        Container name for use in tests
+    """
+    # Check Docker is available
+    result = subprocess.run(
+        ["docker", "info"],
+        capture_output=True,
+        check=False,
+    )
+    if result.returncode != 0:
+        pytest.skip("Docker not available")
+
+    # Remove any existing container
+    subprocess.run(
+        ["docker", "rm", "-f", CONTAINER_NAME],
+        capture_output=True,
+        check=False,
+    )
+
+    # Start fresh container
+    # Note: We use sleep infinity instead of systemd for simplicity
+    # Service validation tests will be skipped without systemd
+    result = subprocess.run(
+        [
+            "docker",
+            "run",
+            "-d",
+            "--name",
+            CONTAINER_NAME,
+            BASE_IMAGE,
+            "sleep",
+            "infinity",
+        ],
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+    if result.returncode != 0:
+        pytest.fail(f"Failed to start container: {result.stderr}")
+
+    # Wait for container to be ready
+    time.sleep(1)
+
+    # Install prerequisites
+    docker_exec(
+        CONTAINER_NAME,
+        "apt-get update -qq && "
+        "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq "
+        "python3 python3-venv python3-pip git curl sudo ca-certificates",
+    )
+
+    yield CONTAINER_NAME
+
+    # Cleanup
+    subprocess.run(
+        ["docker", "rm", "-f", CONTAINER_NAME],
+        capture_output=True,
+        check=False,
+    )
+
+
+@pytest.fixture(scope="module")
+def bundled_installers(tmp_path_factory: pytest.TempPathFactory) -> dict[str, Path]:
+    """Generate bundled installer scripts.
+
+    This fixture generates the single-file installer scripts using the bundler.
+
+    Returns:
+        Dict with 'cli' and 'server' keys pointing to installer paths
+    """
+    from hop3_installer.bundler import bundle_installer
+
+    out_dir = tmp_path_factory.mktemp("installers")
+
+    # Generate CLI installer
+    cli_content = bundle_installer("cli")
+    cli_path = out_dir / "install-cli.py"
+    cli_path.write_text(cli_content)
+    cli_path.chmod(0o755)
+
+    # Generate server installer
+    server_content = bundle_installer("server")
+    server_path = out_dir / "install-server.py"
+    server_path.write_text(server_content)
+    server_path.chmod(0o755)
+
+    return {"cli": cli_path, "server": server_path}
+
+
+@pytest.fixture(scope="module")
+def hop3_packages_dir() -> Path:
+    """Get the path to the hop3 packages directory.
+
+    Returns:
+        Path to packages/ directory in the repository
+    """
+    # Navigate from this file to the packages directory
+    # tests/c_e2e/conftest.py -> packages/hop3-installer/tests/c_e2e/conftest.py
+    this_file = Path(__file__)
+    packages_dir = this_file.parent.parent.parent.parent.parent / "packages"
+
+    if not packages_dir.exists():
+        pytest.fail(f"Packages directory not found: {packages_dir}")
+
+    return packages_dir

packages/hop3-installer/tests/c_e2e/test_cli_installer.py

@@ -0,0 +1,126 @@
+# Copyright (c) 2025-2026, Abilian SAS
+# SPDX-License-Identifier: Apache-2.0
+"""E2E tests for CLI installer (install-cli.py).
+
+These tests verify that the bundled CLI installer correctly installs
+hop3-cli in various scenarios.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import pytest
+
+from .conftest import docker_copy, docker_copy_dir, docker_exec
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+@pytest.mark.e2e
+class TestCLIInstaller:
+    """Test hop3-cli installation via install-cli.py."""
+
+    def test_install_cli_from_git(
+        self,
+        docker_container: str,
+        bundled_installers: dict[str, Path],
+    ) -> None:
+        """Test CLI installation from git repository.
+
+        This is the primary installation method - installing from the
+        git repository's devel branch.
+        """
+        # Copy installer to container
+        docker_copy(docker_container, bundled_installers["cli"], "/tmp/install-cli.py")
+
+        # Run installer with git method
+        result = docker_exec(
+            docker_container,
+            "python3 /tmp/install-cli.py --git --branch devel --no-modify-path --verbose",
+            check=False,
+        )
+
+        # Check installer succeeded
+        assert result.returncode == 0, (
+            f"CLI installer failed:\nstdout: {result.stdout}\nstderr: {result.stderr}"
+        )
+
+        # Validate installation
+        self._validate_cli_installation(docker_container)
+
+    def test_install_cli_from_local_path(
+        self,
+        docker_container: str,
+        bundled_installers: dict[str, Path],
+        hop3_packages_dir: Path,
+    ) -> None:
+        """Test CLI installation from local package path.
+
+        This tests the --local-path option used during development.
+        """
+        # Copy installer to container
+        docker_copy(docker_container, bundled_installers["cli"], "/tmp/install-cli.py")
+
+        # Copy the hop3-cli package to container
+        cli_package = hop3_packages_dir / "hop3-cli"
+        if not cli_package.exists():
+            pytest.skip(f"hop3-cli package not found: {cli_package}")
+
+        docker_copy_dir(docker_container, cli_package, "/tmp/hop3-cli")
+
+        # Clean up any previous installation
+        docker_exec(
+            docker_container,
+            "rm -rf ~/.hop3-cli",
+            check=False,
+        )
+
+        # Run installer with local path
+        result = docker_exec(
+            docker_container,
+            "python3 /tmp/install-cli.py --local-path /tmp/hop3-cli --no-modify-path --verbose",
+            check=False,
+        )
+
+        # Check installer succeeded
+        assert result.returncode == 0, (
+            f"CLI installer failed:\nstdout: {result.stdout}\nstderr: {result.stderr}"
+        )
+
+        # Validate installation
+        self._validate_cli_installation(docker_container)
+
+    def _validate_cli_installation(self, container: str) -> None:
+        """Validate CLI was installed correctly.
+
+        Checks:
+        1. Virtual environment was created
+        2. hop3 command exists in venv
+        3. hop3 command runs without crashing
+        """
+        # Check venv exists
+        result = docker_exec(container, "test -d ~/.hop3-cli/venv", check=False)
+        assert result.returncode == 0, "CLI virtual environment not created"
+
+        # Check hop3 command exists
+        result = docker_exec(
+            container,
+            "test -f ~/.hop3-cli/venv/bin/hop3 || test -f ~/.hop3-cli/venv/bin/hop",
+            check=False,
+        )
+        assert result.returncode == 0, "hop3 command not found in venv"
+
+        # Check hop3 runs (version command doesn't need server config)
+        result = docker_exec(
+            container,
+            "~/.hop3-cli/venv/bin/hop3 version 2>&1 || true",
+            check=False,
+        )
+        # The command might fail if no server is configured, but it should at least
+        # print something about hop3
+        output = (result.stdout + result.stderr).lower()
+        assert "hop3" in output or result.returncode == 0, (
+            f"hop3 command doesn't run properly: {result.stdout} {result.stderr}"
+        )