Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
94b998741f | ||
|
|
172c734866 | ||
|
|
1b483e178d | ||
|
|
78693225f1 | ||
|
|
ca08c84789 |
10
CHANGELOG.md
10
CHANGELOG.md
@@ -1,3 +1,13 @@
|
|||||||
|
## [0.7.11] - 2025-12-09
|
||||||
|
|
||||||
|
* test: fix installer unit tests for OS packages and Nix dev shell
|
||||||
|
|
||||||
|
|
||||||
|
## [0.7.10] - 2025-12-09
|
||||||
|
|
||||||
|
* Fixed test_install_pkgmgr_shallow.py
|
||||||
|
|
||||||
|
|
||||||
## [0.7.9] - 2025-12-09
|
## [0.7.9] - 2025-12-09
|
||||||
|
|
||||||
* 'main' and 'master' are now both accepted as branches for branch close merge
|
* 'main' and 'master' are now both accepted as branches for branch close merge
|
||||||
|
|||||||
2
PKGBUILD
2
PKGBUILD
@@ -1,7 +1,7 @@
|
|||||||
# Maintainer: Kevin Veen-Birkenbach <info@veen.world>
|
# Maintainer: Kevin Veen-Birkenbach <info@veen.world>
|
||||||
|
|
||||||
pkgname=package-manager
|
pkgname=package-manager
|
||||||
pkgver=0.7.9
|
pkgver=0.7.11
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Local-flake wrapper for Kevin's package-manager (Nix-based)."
|
pkgdesc="Local-flake wrapper for Kevin's package-manager (Nix-based)."
|
||||||
arch=('any')
|
arch=('any')
|
||||||
|
|||||||
12
debian/changelog
vendored
12
debian/changelog
vendored
@@ -1,3 +1,15 @@
|
|||||||
|
package-manager (0.7.11-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* test: fix installer unit tests for OS packages and Nix dev shell
|
||||||
|
|
||||||
|
-- Kevin Veen-Birkenbach <kevin@veen.world> Tue, 09 Dec 2025 23:16:46 +0100
|
||||||
|
|
||||||
|
package-manager (0.7.10-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Fixed test_install_pkgmgr_shallow.py
|
||||||
|
|
||||||
|
-- Kevin Veen-Birkenbach <kevin@veen.world> Tue, 09 Dec 2025 22:57:08 +0100
|
||||||
|
|
||||||
package-manager (0.7.9-1) unstable; urgency=medium
|
package-manager (0.7.9-1) unstable; urgency=medium
|
||||||
|
|
||||||
* 'main' and 'master' are now both accepted as branches for branch close merge
|
* 'main' and 'master' are now both accepted as branches for branch close merge
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
rec {
|
rec {
|
||||||
pkgmgr = pyPkgs.buildPythonApplication {
|
pkgmgr = pyPkgs.buildPythonApplication {
|
||||||
pname = "package-manager";
|
pname = "package-manager";
|
||||||
version = "0.7.9";
|
version = "0.7.11";
|
||||||
|
|
||||||
# Use the git repo as source
|
# Use the git repo as source
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
Name: package-manager
|
Name: package-manager
|
||||||
Version: 0.7.9
|
Version: 0.7.11
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Wrapper that runs Kevin's package-manager via Nix flake
|
Summary: Wrapper that runs Kevin's package-manager via Nix flake
|
||||||
|
|
||||||
@@ -77,6 +77,12 @@ echo ">>> package-manager removed. Nix itself was not removed."
|
|||||||
/usr/lib/package-manager/
|
/usr/lib/package-manager/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 09 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 0.7.11-1
|
||||||
|
- test: fix installer unit tests for OS packages and Nix dev shell
|
||||||
|
|
||||||
|
* Tue Dec 09 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 0.7.10-1
|
||||||
|
- Fixed test_install_pkgmgr_shallow.py
|
||||||
|
|
||||||
* Tue Dec 09 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 0.7.9-1
|
* Tue Dec 09 2025 Kevin Veen-Birkenbach <kevin@veen.world> - 0.7.9-1
|
||||||
- 'main' and 'master' are now both accepted as branches for branch close merge
|
- 'main' and 'master' are now both accepted as branches for branch close merge
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "package-manager"
|
name = "package-manager"
|
||||||
version = "0.7.9"
|
version = "0.7.11"
|
||||||
description = "Kevin's package-manager tool (pkgmgr)"
|
description = "Kevin's package-manager tool (pkgmgr)"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ dnf -y install \
|
|||||||
bash \
|
bash \
|
||||||
curl-minimal \
|
curl-minimal \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
sudo \
|
||||||
xz
|
xz
|
||||||
|
|
||||||
dnf clean all
|
dnf clean all
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ for distro in $DISTROS; do
|
|||||||
# Run the command and capture the output
|
# Run the command and capture the output
|
||||||
if OUTPUT=$(docker run --rm \
|
if OUTPUT=$(docker run --rm \
|
||||||
-e PKGMGR_DEV=1 \
|
-e PKGMGR_DEV=1 \
|
||||||
|
-v pkgmgr_nix_store:/nix \
|
||||||
-v "$(pwd):/src" \
|
-v "$(pwd):/src" \
|
||||||
-v "pkgmgr_nix_cache:/root/.cache/nix" \
|
-v "pkgmgr_nix_cache:/root/.cache/nix" \
|
||||||
"$IMAGE" 2>&1); then
|
"$IMAGE" 2>&1); then
|
||||||
|
|||||||
@@ -8,14 +8,9 @@ for distro in $DISTROS; do
|
|||||||
echo ">>> Running E2E tests: $distro"
|
echo ">>> Running E2E tests: $distro"
|
||||||
echo "============================================================"
|
echo "============================================================"
|
||||||
|
|
||||||
MOUNT_NIX=""
|
|
||||||
if [[ "$distro" == "arch" ]]; then
|
|
||||||
MOUNT_NIX="-v pkgmgr_nix_store:/nix"
|
|
||||||
fi
|
|
||||||
|
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
-v "$(pwd):/src" \
|
-v "$(pwd):/src" \
|
||||||
$MOUNT_NIX \
|
-v pkgmgr_nix_store:/nix \
|
||||||
-v "pkgmgr_nix_cache:/root/.cache/nix" \
|
-v "pkgmgr_nix_cache:/root/.cache/nix" \
|
||||||
-e PKGMGR_DEV=1 \
|
-e PKGMGR_DEV=1 \
|
||||||
-e TEST_PATTERN="${TEST_PATTERN}" \
|
-e TEST_PATTERN="${TEST_PATTERN}" \
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ echo "============================================================"
|
|||||||
|
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
-v "$(pwd):/src" \
|
-v "$(pwd):/src" \
|
||||||
|
-v pkgmgr_nix_store:/nix \
|
||||||
-v "pkgmgr_nix_cache:/root/.cache/nix" \
|
-v "pkgmgr_nix_cache:/root/.cache/nix" \
|
||||||
--workdir /src \
|
--workdir /src \
|
||||||
-e PKGMGR_DEV=1 \
|
-e PKGMGR_DEV=1 \
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ echo "============================================================"
|
|||||||
docker run --rm \
|
docker run --rm \
|
||||||
-v "$(pwd):/src" \
|
-v "$(pwd):/src" \
|
||||||
-v "pkgmgr_nix_cache:/root/.cache/nix" \
|
-v "pkgmgr_nix_cache:/root/.cache/nix" \
|
||||||
|
-v pkgmgr_nix_store:/nix \
|
||||||
--workdir /src \
|
--workdir /src \
|
||||||
-e PKGMGR_DEV=1 \
|
-e PKGMGR_DEV=1 \
|
||||||
-e TEST_PATTERN="${TEST_PATTERN}" \
|
-e TEST_PATTERN="${TEST_PATTERN}" \
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ def remove_pkgmgr_from_nix_profile() -> None:
|
|||||||
prints a descriptive format without an index column inside the container.
|
prints a descriptive format without an index column inside the container.
|
||||||
|
|
||||||
Instead, we directly try to remove possible names:
|
Instead, we directly try to remove possible names:
|
||||||
- 'pkgmgr' (the actual name shown in `nix profile list`)
|
- 'pkgmgr'
|
||||||
- 'package-manager' (the name mentioned in Nix's own error hints)
|
- 'package-manager'
|
||||||
"""
|
"""
|
||||||
for spec in ("pkgmgr", "package-manager"):
|
for spec in ("pkgmgr", "package-manager"):
|
||||||
subprocess.run(
|
subprocess.run(
|
||||||
@@ -45,18 +45,34 @@ def remove_pkgmgr_from_nix_profile() -> None:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def configure_git_safe_directory() -> None:
|
||||||
|
"""
|
||||||
|
Configure Git to treat /src as a safe directory.
|
||||||
|
|
||||||
|
Needed because /src is a bind-mounted repository in CI, often owned by a
|
||||||
|
different UID. Modern Git aborts with:
|
||||||
|
'fatal: detected dubious ownership in repository at /src/.git'
|
||||||
|
|
||||||
|
This fix applies ONLY inside this test container.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
subprocess.run(
|
||||||
|
["git", "config", "--global", "--add", "safe.directory", "/src"],
|
||||||
|
check=False,
|
||||||
|
)
|
||||||
|
except FileNotFoundError:
|
||||||
|
print("[WARN] git not found – skipping safe.directory configuration")
|
||||||
|
|
||||||
|
|
||||||
def pkgmgr_help_debug() -> None:
|
def pkgmgr_help_debug() -> None:
|
||||||
"""
|
"""
|
||||||
Run `pkgmgr --help` after installation *inside an interactive bash shell*,
|
Run `pkgmgr --help` after installation *inside an interactive bash shell*,
|
||||||
print its output and return code, but never fail the test.
|
print its output and return code, but never fail the test.
|
||||||
|
|
||||||
Reason:
|
This ensures the installer’s shell RC changes are actually loaded.
|
||||||
- The installer adds venv/alias setup into shell rc files (~/.bashrc, ~/.zshrc)
|
|
||||||
- Those changes are only applied in a new interactive shell session.
|
|
||||||
"""
|
"""
|
||||||
print("\n--- PKGMGR HELP (after installation, via bash -i) ---")
|
print("\n--- PKGMGR HELP (after installation, via bash -i) ---")
|
||||||
|
|
||||||
# Simulate a fresh interactive bash, so ~/.bashrc gets sourced
|
|
||||||
proc = subprocess.run(
|
proc = subprocess.run(
|
||||||
["bash", "-i", "-c", "pkgmgr --help"],
|
["bash", "-i", "-c", "pkgmgr --help"],
|
||||||
capture_output=True,
|
capture_output=True,
|
||||||
@@ -76,10 +92,6 @@ def pkgmgr_help_debug() -> None:
|
|||||||
print(f"returncode: {proc.returncode}")
|
print(f"returncode: {proc.returncode}")
|
||||||
print("--- END ---\n")
|
print("--- END ---\n")
|
||||||
|
|
||||||
# Important: this is **debug-only**. Do NOT fail the test here.
|
|
||||||
# If you ever want to hard-assert on this, you can add an explicit
|
|
||||||
# assertion in the test method instead of here.
|
|
||||||
|
|
||||||
|
|
||||||
class TestIntegrationInstalPKGMGRShallow(unittest.TestCase):
|
class TestIntegrationInstalPKGMGRShallow(unittest.TestCase):
|
||||||
def test_install_pkgmgr_self_install(self) -> None:
|
def test_install_pkgmgr_self_install(self) -> None:
|
||||||
@@ -87,12 +99,8 @@ class TestIntegrationInstalPKGMGRShallow(unittest.TestCase):
|
|||||||
End-to-end test that runs "python main.py install pkgmgr ..." inside
|
End-to-end test that runs "python main.py install pkgmgr ..." inside
|
||||||
the test container.
|
the test container.
|
||||||
|
|
||||||
We isolate HOME into /tmp/pkgmgr-self-install so that:
|
HOME is isolated to avoid permission problems with Nix & repositories.
|
||||||
- ~/.config/pkgmgr points to an isolated test config area
|
|
||||||
- ~/Repositories is owned by the current user inside the container
|
|
||||||
(avoiding Nix's 'repository path is not owned by current user' error)
|
|
||||||
"""
|
"""
|
||||||
# Use a dedicated HOME for this test to avoid permission/ownership issues
|
|
||||||
temp_home = "/tmp/pkgmgr-self-install"
|
temp_home = "/tmp/pkgmgr-self-install"
|
||||||
os.makedirs(temp_home, exist_ok=True)
|
os.makedirs(temp_home, exist_ok=True)
|
||||||
|
|
||||||
@@ -103,20 +111,24 @@ class TestIntegrationInstalPKGMGRShallow(unittest.TestCase):
|
|||||||
# Isolate HOME so that ~ expands to /tmp/pkgmgr-self-install
|
# Isolate HOME so that ~ expands to /tmp/pkgmgr-self-install
|
||||||
os.environ["HOME"] = temp_home
|
os.environ["HOME"] = temp_home
|
||||||
|
|
||||||
# Optional: ensure XDG_* also use the temp HOME for extra isolation
|
# Optional XDG override for a fully isolated environment
|
||||||
os.environ.setdefault("XDG_CONFIG_HOME", os.path.join(temp_home, ".config"))
|
os.environ.setdefault("XDG_CONFIG_HOME", os.path.join(temp_home, ".config"))
|
||||||
os.environ.setdefault("XDG_CACHE_HOME", os.path.join(temp_home, ".cache"))
|
os.environ.setdefault("XDG_CACHE_HOME", os.path.join(temp_home, ".cache"))
|
||||||
os.environ.setdefault("XDG_DATA_HOME", os.path.join(temp_home, ".local", "share"))
|
os.environ.setdefault("XDG_DATA_HOME", os.path.join(temp_home, ".local", "share"))
|
||||||
|
|
||||||
|
# 🔧 IMPORTANT FIX: allow Git to access /src safely
|
||||||
|
configure_git_safe_directory()
|
||||||
|
|
||||||
# Debug before cleanup
|
# Debug before cleanup
|
||||||
nix_profile_list_debug("BEFORE CLEANUP")
|
nix_profile_list_debug("BEFORE CLEANUP")
|
||||||
|
|
||||||
# Cleanup: aggressively try to drop any pkgmgr/profile entries
|
# Cleanup: drop any pkgmgr entries from nix profile
|
||||||
remove_pkgmgr_from_nix_profile()
|
remove_pkgmgr_from_nix_profile()
|
||||||
|
|
||||||
# Debug after cleanup
|
# Debug after cleanup
|
||||||
nix_profile_list_debug("AFTER CLEANUP")
|
nix_profile_list_debug("AFTER CLEANUP")
|
||||||
|
|
||||||
|
# Prepare argv for module execution
|
||||||
sys.argv = [
|
sys.argv = [
|
||||||
"python",
|
"python",
|
||||||
"install",
|
"install",
|
||||||
@@ -126,15 +138,15 @@ class TestIntegrationInstalPKGMGRShallow(unittest.TestCase):
|
|||||||
"--no-verification",
|
"--no-verification",
|
||||||
]
|
]
|
||||||
|
|
||||||
# Run installation via main.py
|
# Execute installation via main.py
|
||||||
runpy.run_module("main", run_name="__main__")
|
runpy.run_module("main", run_name="__main__")
|
||||||
|
|
||||||
# After successful installation: run `pkgmgr --help` for debug
|
# Debug: interactive shell test
|
||||||
pkgmgr_help_debug()
|
pkgmgr_help_debug()
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
|
# Restore system state
|
||||||
sys.argv = original_argv
|
sys.argv = original_argv
|
||||||
# Restore full environment
|
|
||||||
os.environ.clear()
|
os.environ.clear()
|
||||||
os.environ.update(original_environ)
|
os.environ.update(original_environ)
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
# tests/unit/pkgmgr/installers/os_packages/test_debian_control.py
|
|
||||||
|
|
||||||
import os
|
|
||||||
import unittest
|
import unittest
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
from pkgmgr.actions.repository.install.context import RepoContext
|
from pkgmgr.actions.repository.install.context import RepoContext
|
||||||
from pkgmgr.actions.repository.install.installers.os_packages.debian_control import DebianControlInstaller
|
from pkgmgr.actions.repository.install.installers.os_packages.debian_control import (
|
||||||
|
DebianControlInstaller,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TestDebianControlInstaller(unittest.TestCase):
|
class TestDebianControlInstaller(unittest.TestCase):
|
||||||
@@ -29,14 +28,24 @@ class TestDebianControlInstaller(unittest.TestCase):
|
|||||||
@patch("os.path.exists", return_value=True)
|
@patch("os.path.exists", return_value=True)
|
||||||
@patch("shutil.which", return_value="/usr/bin/dpkg-buildpackage")
|
@patch("shutil.which", return_value="/usr/bin/dpkg-buildpackage")
|
||||||
def test_supports_true(self, mock_which, mock_exists):
|
def test_supports_true(self, mock_which, mock_exists):
|
||||||
|
"""
|
||||||
|
supports() should return True when dpkg-buildpackage is available
|
||||||
|
and a debian/control file exists in the repository.
|
||||||
|
"""
|
||||||
self.assertTrue(self.installer.supports(self.ctx))
|
self.assertTrue(self.installer.supports(self.ctx))
|
||||||
|
|
||||||
@patch("os.path.exists", return_value=True)
|
@patch("os.path.exists", return_value=True)
|
||||||
@patch("shutil.which", return_value=None)
|
@patch("shutil.which", return_value=None)
|
||||||
def test_supports_false_without_dpkg_buildpackage(self, mock_which, mock_exists):
|
def test_supports_false_without_dpkg_buildpackage(self, mock_which, mock_exists):
|
||||||
|
"""
|
||||||
|
supports() should return False when dpkg-buildpackage is not available,
|
||||||
|
even if a debian/control file exists.
|
||||||
|
"""
|
||||||
self.assertFalse(self.installer.supports(self.ctx))
|
self.assertFalse(self.installer.supports(self.ctx))
|
||||||
|
|
||||||
@patch("pkgmgr.actions.repository.install.installers.os_packages.debian_control.run_command")
|
@patch(
|
||||||
|
"pkgmgr.actions.repository.install.installers.os_packages.debian_control.run_command"
|
||||||
|
)
|
||||||
@patch("glob.glob", return_value=["/tmp/package-manager_0.1.1_all.deb"])
|
@patch("glob.glob", return_value=["/tmp/package-manager_0.1.1_all.deb"])
|
||||||
@patch("os.path.exists", return_value=True)
|
@patch("os.path.exists", return_value=True)
|
||||||
@patch("shutil.which")
|
@patch("shutil.which")
|
||||||
@@ -47,7 +56,19 @@ class TestDebianControlInstaller(unittest.TestCase):
|
|||||||
mock_glob,
|
mock_glob,
|
||||||
mock_run_command,
|
mock_run_command,
|
||||||
):
|
):
|
||||||
# dpkg-buildpackage + apt-get vorhanden
|
"""
|
||||||
|
run() should:
|
||||||
|
|
||||||
|
1. Install build dependencies (apt-get build-dep).
|
||||||
|
2. Build the package using dpkg-buildpackage -b -us -uc.
|
||||||
|
3. Discover built .deb files via glob.
|
||||||
|
4. Install the resulting .deb packages using a suitable tool:
|
||||||
|
- dpkg -i
|
||||||
|
- sudo dpkg -i
|
||||||
|
- or sudo apt-get install -y
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Simulate dpkg-buildpackage and apt-get being available.
|
||||||
def which_side_effect(name):
|
def which_side_effect(name):
|
||||||
if name == "dpkg-buildpackage":
|
if name == "dpkg-buildpackage":
|
||||||
return "/usr/bin/dpkg-buildpackage"
|
return "/usr/bin/dpkg-buildpackage"
|
||||||
@@ -64,16 +85,35 @@ class TestDebianControlInstaller(unittest.TestCase):
|
|||||||
# 1) apt-get update
|
# 1) apt-get update
|
||||||
self.assertTrue(any("apt-get update" in cmd for cmd in cmds))
|
self.assertTrue(any("apt-get update" in cmd for cmd in cmds))
|
||||||
|
|
||||||
# 2) apt-get build-dep ./
|
# 2) apt-get build-dep -y ./ (with or without trailing space)
|
||||||
self.assertTrue(any("apt-get build-dep -y ./ " in cmd or
|
self.assertTrue(
|
||||||
"apt-get build-dep -y ./"
|
any(
|
||||||
in cmd for cmd in cmds))
|
"apt-get build-dep -y ./ " in cmd
|
||||||
|
or "apt-get build-dep -y ./"
|
||||||
|
in cmd
|
||||||
|
for cmd in cmds
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
# 3) dpkg-buildpackage -b -us -uc
|
# 3) dpkg-buildpackage -b -us -uc
|
||||||
self.assertTrue(any("dpkg-buildpackage -b -us -uc" in cmd for cmd in cmds))
|
self.assertTrue(any("dpkg-buildpackage -b -us -uc" in cmd for cmd in cmds))
|
||||||
|
|
||||||
# 4) dpkg -i ../*.deb
|
# 4) final installation of .deb packages:
|
||||||
self.assertTrue(any(cmd.startswith("sudo dpkg -i ") for cmd in cmds))
|
# accept dpkg -i, sudo dpkg -i, or sudo apt-get install -y
|
||||||
|
has_plain_dpkg_install = any(cmd.startswith("dpkg -i ") for cmd in cmds)
|
||||||
|
has_sudo_dpkg_install = any(cmd.startswith("sudo dpkg -i ") for cmd in cmds)
|
||||||
|
has_apt_install = any(
|
||||||
|
cmd.startswith("sudo apt-get install -y ") for cmd in cmds
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertTrue(
|
||||||
|
has_plain_dpkg_install or has_sudo_dpkg_install or has_apt_install,
|
||||||
|
msg=(
|
||||||
|
"Expected one of 'dpkg -i', 'sudo dpkg -i' or "
|
||||||
|
"'sudo apt-get install -y', but got commands: "
|
||||||
|
f"{cmds}"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
# tests/unit/pkgmgr/installers/os_packages/test_rpm_spec.py
|
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
from pkgmgr.actions.repository.install.context import RepoContext
|
from pkgmgr.actions.repository.install.context import RepoContext
|
||||||
from pkgmgr.actions.repository.install.installers.os_packages.rpm_spec import RpmSpecInstaller
|
from pkgmgr.actions.repository.install.installers.os_packages.rpm_spec import (
|
||||||
|
RpmSpecInstaller,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class TestRpmSpecInstaller(unittest.TestCase):
|
class TestRpmSpecInstaller(unittest.TestCase):
|
||||||
@@ -28,6 +28,13 @@ class TestRpmSpecInstaller(unittest.TestCase):
|
|||||||
@patch("glob.glob", return_value=["/tmp/repo/test.spec"])
|
@patch("glob.glob", return_value=["/tmp/repo/test.spec"])
|
||||||
@patch("shutil.which")
|
@patch("shutil.which")
|
||||||
def test_supports_true(self, mock_which, mock_glob):
|
def test_supports_true(self, mock_which, mock_glob):
|
||||||
|
"""
|
||||||
|
supports() should return True when:
|
||||||
|
- rpmbuild is available, and
|
||||||
|
- at least one of dnf/yum/yum-builddep is available, and
|
||||||
|
- a *.spec file is present in the repo.
|
||||||
|
"""
|
||||||
|
|
||||||
def which_side_effect(name):
|
def which_side_effect(name):
|
||||||
if name == "rpmbuild":
|
if name == "rpmbuild":
|
||||||
return "/usr/bin/rpmbuild"
|
return "/usr/bin/rpmbuild"
|
||||||
@@ -42,9 +49,14 @@ class TestRpmSpecInstaller(unittest.TestCase):
|
|||||||
@patch("glob.glob", return_value=[])
|
@patch("glob.glob", return_value=[])
|
||||||
@patch("shutil.which")
|
@patch("shutil.which")
|
||||||
def test_supports_false_missing_spec(self, mock_which, mock_glob):
|
def test_supports_false_missing_spec(self, mock_which, mock_glob):
|
||||||
|
"""
|
||||||
|
supports() should return False if no *.spec file is found,
|
||||||
|
even if rpmbuild is present.
|
||||||
|
"""
|
||||||
mock_which.return_value = "/usr/bin/rpmbuild"
|
mock_which.return_value = "/usr/bin/rpmbuild"
|
||||||
self.assertFalse(self.installer.supports(self.ctx))
|
self.assertFalse(self.installer.supports(self.ctx))
|
||||||
|
|
||||||
|
@patch.object(RpmSpecInstaller, "_prepare_source_tarball")
|
||||||
@patch("pkgmgr.actions.repository.install.installers.os_packages.rpm_spec.run_command")
|
@patch("pkgmgr.actions.repository.install.installers.os_packages.rpm_spec.run_command")
|
||||||
@patch("glob.glob")
|
@patch("glob.glob")
|
||||||
@patch("shutil.which")
|
@patch("shutil.which")
|
||||||
@@ -53,8 +65,20 @@ class TestRpmSpecInstaller(unittest.TestCase):
|
|||||||
mock_which,
|
mock_which,
|
||||||
mock_glob,
|
mock_glob,
|
||||||
mock_run_command,
|
mock_run_command,
|
||||||
|
mock_prepare_source_tarball,
|
||||||
):
|
):
|
||||||
# glob.glob wird zweimal benutzt: einmal für *.spec, einmal für gebaute RPMs
|
"""
|
||||||
|
run() should:
|
||||||
|
|
||||||
|
1. Determine the .spec file in the repo.
|
||||||
|
2. Call _prepare_source_tarball() once with ctx and spec path.
|
||||||
|
3. Install build dependencies via dnf/yum-builddep/yum.
|
||||||
|
4. Call rpmbuild -ba <spec>.
|
||||||
|
5. Find built RPMs via glob.
|
||||||
|
6. Install built RPMs via dnf/yum/rpm (here: dnf).
|
||||||
|
"""
|
||||||
|
|
||||||
|
# glob.glob is used twice: once for *.spec, once for built RPMs.
|
||||||
def glob_side_effect(pattern, recursive=False):
|
def glob_side_effect(pattern, recursive=False):
|
||||||
if pattern.endswith("*.spec"):
|
if pattern.endswith("*.spec"):
|
||||||
return ["/tmp/repo/package-manager.spec"]
|
return ["/tmp/repo/package-manager.spec"]
|
||||||
@@ -77,16 +101,23 @@ class TestRpmSpecInstaller(unittest.TestCase):
|
|||||||
|
|
||||||
self.installer.run(self.ctx)
|
self.installer.run(self.ctx)
|
||||||
|
|
||||||
|
# _prepare_source_tarball must have been called with the resolved spec path.
|
||||||
|
mock_prepare_source_tarball.assert_called_once_with(
|
||||||
|
self.ctx,
|
||||||
|
"/tmp/repo/package-manager.spec",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Collect all command strings passed to run_command.
|
||||||
cmds = [c[0][0] for c in mock_run_command.call_args_list]
|
cmds = [c[0][0] for c in mock_run_command.call_args_list]
|
||||||
|
|
||||||
# 1) builddep
|
# 1) build dependencies (dnf builddep)
|
||||||
self.assertTrue(any("builddep -y" in cmd for cmd in cmds))
|
self.assertTrue(any("builddep -y" in cmd for cmd in cmds))
|
||||||
|
|
||||||
# 2) rpmbuild -ba
|
# 2) rpmbuild -ba <spec>
|
||||||
self.assertTrue(any(cmd.startswith("rpmbuild -ba ") for cmd in cmds))
|
self.assertTrue(any(cmd.startswith("rpmbuild -ba ") for cmd in cmds))
|
||||||
|
|
||||||
# 3) rpm -i …
|
# 3) installation via dnf: "sudo dnf install -y <rpms>"
|
||||||
self.assertTrue(any(cmd.startswith("sudo rpm -i ") for cmd in cmds))
|
self.assertTrue(any(cmd.startswith("sudo dnf install -y ") for cmd in cmds))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
@@ -28,14 +28,27 @@ class TestNixFlakeInstaller(unittest.TestCase):
|
|||||||
@patch("shutil.which", return_value="/usr/bin/nix")
|
@patch("shutil.which", return_value="/usr/bin/nix")
|
||||||
@patch("os.path.exists", return_value=True)
|
@patch("os.path.exists", return_value=True)
|
||||||
def test_supports_true_when_nix_and_flake_exist(self, mock_exists, mock_which):
|
def test_supports_true_when_nix_and_flake_exist(self, mock_exists, mock_which):
|
||||||
self.assertTrue(self.installer.supports(self.ctx))
|
"""
|
||||||
|
supports() should return True when:
|
||||||
|
- nix is available,
|
||||||
|
- flake.nix exists in the repo,
|
||||||
|
- and we are not inside a Nix dev shell.
|
||||||
|
"""
|
||||||
|
with patch.dict(os.environ, {"IN_NIX_SHELL": ""}, clear=False):
|
||||||
|
self.assertTrue(self.installer.supports(self.ctx))
|
||||||
|
|
||||||
mock_which.assert_called_with("nix")
|
mock_which.assert_called_with("nix")
|
||||||
mock_exists.assert_called_with(os.path.join(self.ctx.repo_dir, "flake.nix"))
|
mock_exists.assert_called_with(os.path.join(self.ctx.repo_dir, "flake.nix"))
|
||||||
|
|
||||||
@patch("shutil.which", return_value=None)
|
@patch("shutil.which", return_value=None)
|
||||||
@patch("os.path.exists", return_value=True)
|
@patch("os.path.exists", return_value=True)
|
||||||
def test_supports_false_when_nix_missing(self, mock_exists, mock_which):
|
def test_supports_false_when_nix_missing(self, mock_exists, mock_which):
|
||||||
self.assertFalse(self.installer.supports(self.ctx))
|
"""
|
||||||
|
supports() should return False if nix is not available,
|
||||||
|
even if a flake.nix file exists.
|
||||||
|
"""
|
||||||
|
with patch.dict(os.environ, {"IN_NIX_SHELL": ""}, clear=False):
|
||||||
|
self.assertFalse(self.installer.supports(self.ctx))
|
||||||
|
|
||||||
@patch("os.path.exists", return_value=True)
|
@patch("os.path.exists", return_value=True)
|
||||||
@patch("shutil.which", return_value="/usr/bin/nix")
|
@patch("shutil.which", return_value="/usr/bin/nix")
|
||||||
@@ -47,10 +60,12 @@ class TestNixFlakeInstaller(unittest.TestCase):
|
|||||||
mock_exists,
|
mock_exists,
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
Ensure that run():
|
run() should:
|
||||||
- first tries to remove the old 'package-manager' profile entry
|
|
||||||
- then installs both 'pkgmgr' and 'default' outputs.
|
1. attempt to remove the old 'package-manager' profile entry, and
|
||||||
|
2. install both 'pkgmgr' and 'default' flake outputs.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
cmds = []
|
cmds = []
|
||||||
|
|
||||||
def side_effect(cmd, cwd=None, preview=False, *args, **kwargs):
|
def side_effect(cmd, cwd=None, preview=False, *args, **kwargs):
|
||||||
@@ -59,18 +74,24 @@ class TestNixFlakeInstaller(unittest.TestCase):
|
|||||||
|
|
||||||
mock_run_command.side_effect = side_effect
|
mock_run_command.side_effect = side_effect
|
||||||
|
|
||||||
self.installer.run(self.ctx)
|
# Simulate a normal environment (not inside nix develop, installer enabled).
|
||||||
|
with patch.dict(
|
||||||
|
os.environ,
|
||||||
|
{"IN_NIX_SHELL": "", "PKGMGR_DISABLE_NIX_FLAKE_INSTALLER": ""},
|
||||||
|
clear=False,
|
||||||
|
):
|
||||||
|
self.installer.run(self.ctx)
|
||||||
|
|
||||||
remove_cmd = f"nix profile remove {self.installer.PROFILE_NAME} || true"
|
remove_cmd = f"nix profile remove {self.installer.PROFILE_NAME} || true"
|
||||||
install_pkgmgr_cmd = f"nix profile install {self.ctx.repo_dir}#pkgmgr"
|
install_pkgmgr_cmd = f"nix profile install {self.ctx.repo_dir}#pkgmgr"
|
||||||
install_default_cmd = f"nix profile install {self.ctx.repo_dir}#default"
|
install_default_cmd = f"nix profile install {self.ctx.repo_dir}#default"
|
||||||
|
|
||||||
# Mindestens diese drei Kommandos müssen aufgerufen worden sein
|
# At least these three commands must have been issued.
|
||||||
self.assertIn(remove_cmd, cmds)
|
self.assertIn(remove_cmd, cmds)
|
||||||
self.assertIn(install_pkgmgr_cmd, cmds)
|
self.assertIn(install_pkgmgr_cmd, cmds)
|
||||||
self.assertIn(install_default_cmd, cmds)
|
self.assertIn(install_default_cmd, cmds)
|
||||||
|
|
||||||
# Optional: sicherstellen, dass der remove-Aufruf zuerst kam
|
# Optional: ensure the remove call came first.
|
||||||
self.assertEqual(cmds[0], remove_cmd)
|
self.assertEqual(cmds[0], remove_cmd)
|
||||||
|
|
||||||
@patch("shutil.which", return_value="/usr/bin/nix")
|
@patch("shutil.which", return_value="/usr/bin/nix")
|
||||||
@@ -90,8 +111,13 @@ class TestNixFlakeInstaller(unittest.TestCase):
|
|||||||
|
|
||||||
mock_run_command.side_effect = side_effect
|
mock_run_command.side_effect = side_effect
|
||||||
|
|
||||||
# Should not raise, SystemExit is swallowed internally.
|
with patch.dict(
|
||||||
self.installer._ensure_old_profile_removed(self.ctx)
|
os.environ,
|
||||||
|
{"IN_NIX_SHELL": "", "PKGMGR_DISABLE_NIX_FLAKE_INSTALLER": ""},
|
||||||
|
clear=False,
|
||||||
|
):
|
||||||
|
# Should not raise, SystemExit is swallowed internally.
|
||||||
|
self.installer._ensure_old_profile_removed(self.ctx)
|
||||||
|
|
||||||
remove_cmd = f"nix profile remove {self.installer.PROFILE_NAME} || true"
|
remove_cmd = f"nix profile remove {self.installer.PROFILE_NAME} || true"
|
||||||
mock_run_command.assert_called_with(
|
mock_run_command.assert_called_with(
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
# tests/unit/pkgmgr/installers/test_python_installer.py
|
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
@@ -28,18 +26,40 @@ class TestPythonInstaller(unittest.TestCase):
|
|||||||
|
|
||||||
@patch("os.path.exists", side_effect=lambda path: path.endswith("pyproject.toml"))
|
@patch("os.path.exists", side_effect=lambda path: path.endswith("pyproject.toml"))
|
||||||
def test_supports_true_when_pyproject_exists(self, mock_exists):
|
def test_supports_true_when_pyproject_exists(self, mock_exists):
|
||||||
self.assertTrue(self.installer.supports(self.ctx))
|
"""
|
||||||
|
supports() should return True when a pyproject.toml exists in the repo
|
||||||
|
and we are not inside a Nix dev shell.
|
||||||
|
"""
|
||||||
|
with patch.dict(os.environ, {"IN_NIX_SHELL": ""}, clear=False):
|
||||||
|
self.assertTrue(self.installer.supports(self.ctx))
|
||||||
|
|
||||||
@patch("os.path.exists", return_value=False)
|
@patch("os.path.exists", return_value=False)
|
||||||
def test_supports_false_when_no_pyproject(self, mock_exists):
|
def test_supports_false_when_no_pyproject(self, mock_exists):
|
||||||
self.assertFalse(self.installer.supports(self.ctx))
|
"""
|
||||||
|
supports() should return False when no pyproject.toml exists.
|
||||||
|
"""
|
||||||
|
with patch.dict(os.environ, {"IN_NIX_SHELL": ""}, clear=False):
|
||||||
|
self.assertFalse(self.installer.supports(self.ctx))
|
||||||
|
|
||||||
@patch("pkgmgr.actions.repository.install.installers.python.run_command")
|
@patch("pkgmgr.actions.repository.install.installers.python.run_command")
|
||||||
@patch("os.path.exists", side_effect=lambda path: path.endswith("pyproject.toml"))
|
@patch("os.path.exists", side_effect=lambda path: path.endswith("pyproject.toml"))
|
||||||
def test_run_installs_project_from_pyproject(self, mock_exists, mock_run_command):
|
def test_run_installs_project_from_pyproject(self, mock_exists, mock_run_command):
|
||||||
self.installer.run(self.ctx)
|
"""
|
||||||
|
run() should invoke pip to install the project from pyproject.toml
|
||||||
|
when we are not inside a Nix dev shell.
|
||||||
|
"""
|
||||||
|
# Simulate a normal environment (not inside nix develop).
|
||||||
|
with patch.dict(os.environ, {"IN_NIX_SHELL": ""}, clear=False):
|
||||||
|
self.installer.run(self.ctx)
|
||||||
|
|
||||||
|
# Ensure run_command was actually called.
|
||||||
|
mock_run_command.assert_called()
|
||||||
|
|
||||||
|
# Extract the command string.
|
||||||
cmd = mock_run_command.call_args[0][0]
|
cmd = mock_run_command.call_args[0][0]
|
||||||
self.assertIn("pip install .", cmd)
|
self.assertIn("pip install .", cmd)
|
||||||
|
|
||||||
|
# Ensure the working directory is the repo dir.
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
mock_run_command.call_args[1].get("cwd"),
|
mock_run_command.call_args[1].get("cwd"),
|
||||||
self.ctx.repo_dir,
|
self.ctx.repo_dir,
|
||||||
|
|||||||
Reference in New Issue
Block a user