chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-25.05] nixos-rebuild-ng: fix test failure introduced in #420352 (#420848)

Browse Source
This commit is contained in:
Thiago Kenji Okada
2025-06-28 21:55:53 +01:00
committed by GitHub
parent c14315b5d9 91be47a6c3
commit 23bc3554cc
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/ni/nixos-rebuild-ng/package.nix
View File

@@ -111,6 +111,10 @@ python3Packages.buildPythonApplication rec {
};
tests = {
with_reexec = nixos-rebuild-ng.override {
withReexec = true;
withNgSuffix = false;
};
with_nix_latest = nixos-rebuild-ng.override {
nix = nixVersions.latest;
};
@@ -122,11 +126,9 @@ python3Packages.buildPythonApplication rec {
nix = nixVersions.nix_2_3;
};
with_lix_latest = nixos-rebuild-ng.override {
# oldest / minimum supported version in nixpkgs
nix = lixPackageSets.latest.lix;
};
with_lix_stable = nixos-rebuild-ng.override {
# oldest / minimum supported version in nixpkgs
nix = lixPackageSets.stable.lix;
};

4
pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
View File

@@ -132,7 +132,7 @@ def test_parse_args() -> None:
@patch("os.execve", autospec=True)
@patch(get_qualified_name(nr.nix.build), autospec=True)
def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -> None:
monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng")
monkeypatch.setattr(nr.services, "EXECUTABLE", "nixos-rebuild-ng")
argv = ["/path/bin/nixos-rebuild-ng", "switch", "--no-flake"]
args, _ = nr.parse_args(argv)
mock_build.return_value = Path("/path")
@@ -178,7 +178,7 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -
def test_reexec_flake(
mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch
) -> None:
monkeypatch.setattr(nr, "EXECUTABLE", "nixos-rebuild-ng")
monkeypatch.setattr(nr.services, "EXECUTABLE", "nixos-rebuild-ng")
argv = ["/path/bin/nixos-rebuild-ng", "switch", "--flake"]
args, _ = nr.parse_args(argv)
mock_build.return_value = Path("/path")