nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 03:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos-rebuild-ng: handle JSONDecodeError

Browse Source
This commit is contained in:
Thiago Kenji Okada
2026-09-28 09:58:40 +01:00
parent 896eba9b0d
commit 716f0c4e18
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
View File

@@ -511,15 +511,16 @@ def list_generations(profile: Profile) -> list[GenerationJson]:
profile.path.parent / f"{profile.path.name}-{generation.id}-link"
)
j: NixOSVersionJson = {}
j: NixOSVersionJson
try:
result = run_wrapper(
[generation_path / "sw/bin/nixos-version", "--json"],
capture_output=True,
).stdout
j = json.loads(result)
except (OSError, CalledProcessError) as ex:
except (OSError, CalledProcessError, json.JSONDecodeError) as ex:
logger.debug("could not get configuration revision: %s", ex)
j = {}
return GenerationJson(
generation=generation.id,

67
pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
View File

@@ -590,65 +590,64 @@ def test_list_generations(
mock_get_generations: Mock,
tmp_path: Path,
) -> None:
mock_run.return_value = CompletedProcess(
args=[],
returncode=0,
stdout=json.dumps({"nixosVersion": "26.11.20260926.dirty"}),
)
assert n.list_generations(m.Profile("system", tmp_path)) == [
{
"configurationRevision": "Unknown",
"current": True,
"date": "2024-11-07 23:54:17",
"generation": 2,
"kernelVersion": "Unknown",
"nixosVersion": "26.11.20260926.dirty",
"specialisations": [],
},
{
"configurationRevision": "Unknown",
"current": False,
"date": "2024-11-07 23:54:17",
"generation": 1,
"kernelVersion": "Unknown",
"nixosVersion": "26.11.20260926.dirty",
"specialisations": [],
},
]
# happy path
mock_run.return_value = CompletedProcess(
args=[],
returncode=0,
stdout=json.dumps(
{
"configurationRevision": "dirty",
"configurationRevision": "3f0180ea99a4c8277961825ec5fca2b50a0eca75",
"kernelVersion": "7.2.8",
"nixosVersion": "26.11.20260926.dirty",
"specialisations": [],
"nixosVersion": "26.11.20260925.e94cb15",
"specialisations": ["foo", "bar"],
}
),
)
assert n.list_generations(m.Profile("system", tmp_path)) == [
{
"configurationRevision": "dirty",
"configurationRevision": "3f0180ea99a4c8277961825ec5fca2b50a0eca75",
"current": True,
"date": "2024-11-07 23:54:17",
"generation": 2,
"kernelVersion": "7.2.8",
"nixosVersion": "26.11.20260926.dirty",
"specialisations": [],
"nixosVersion": "26.11.20260925.e94cb15",
"specialisations": ["foo", "bar"],
},
{
"configurationRevision": "dirty",
"configurationRevision": "3f0180ea99a4c8277961825ec5fca2b50a0eca75",
"current": False,
"date": "2024-11-07 23:54:17",
"generation": 1,
"kernelVersion": "7.2.8",
"nixosVersion": "26.11.20260926.dirty",
"nixosVersion": "26.11.20260925.e94cb15",
"specialisations": ["foo", "bar"],
},
]
# parsing invalid JSON
mock_run.return_value = CompletedProcess(args=[], returncode=0, stdout="garbage")
assert n.list_generations(m.Profile("system", tmp_path)) == [
{
"configurationRevision": "Unknown",
"current": True,
"date": "2024-11-07 23:54:17",
"generation": 2,
"kernelVersion": "Unknown",
"nixosVersion": "Unknown",
"specialisations": [],
},
{
"configurationRevision": "Unknown",
"current": False,
"date": "2024-11-07 23:54:17",
"generation": 1,
"kernelVersion": "Unknown",
"nixosVersion": "Unknown",
"specialisations": [],
},
]
# error calling nixos-version
mock_run.side_effect = CalledProcessError(returncode=1, cmd=[])
assert n.list_generations(m.Profile("system", tmp_path)) == [
{