Make tools tree available in tests

For use with find_binary() to check if binaries exist in the tools tree.
systemd · Oct 7, 2024 · 8df145a · 8df145a
1 parent 5e13084
commit 8df145a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -25,6 +25,7 @@ class ImageConfig:
  distribution: Distribution
  release: str
  debug_shell: bool
+ tools: Optional[Path]
 
 
 class Image:
@@ -64,6 +65,7 @@ def mkosi(
  return run(
  [
  "python3", "-m", "mkosi",
+ *(["--tools-tree", self.config.tools] if self.config.tools else []),
  "--debug",
  *options,
  verb,

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 from collections.abc import Iterator
+from pathlib import Path
 from typing import Any, cast
 
 import pytest
@@ -48,6 +49,7 @@ def config(request: Any) -> ImageConfig:
  distribution=distribution,
  release=release,
  debug_shell=request.config.getoption("--debug-shell"),
+ tools=p if (p := Path("mkosi.tools").exists()) else None,
  )