nixos-tests: Fix all tests #83

Merged

ma27 merged 3 commits from samueldr-at-cyberus/hydra:fix/nixos-tests.nix into main

2026-06-14 11:48:29 +00:00

samueldr-at-cyberus commented

2026-06-10 16:32:23 +00:00

Contributor

The first change is trivial enough that the credit is not needed, but I believe it's appropriate to cross-reference here.

An attempt was made at git cherry-pick -x, but other changes were conflicting. So the changes were undone and the same logical changes (%s/wait_for_job/wait_for_unit/g) were made.

(currently being) Checked with:

nix-build --expr '
    with import ./.;
    let
        pick = builtins.mapAttrs (_: v: v.${builtins.currentSystem});
    in
    builtins.concatLists (
        map builtins.attrValues (
            builtins.attrValues (
                pick
                { tests.${builtins.currentSystem} = pick hydraJobs.tests; inherit checks packages; }
            )
        )
    )
'

This is inelegant since the interface used with the Flake here is awkward, when wanting to run all hydraJobs.tests, since the lack of ${builtins.currentSystem} is leaking at different levels regarding the attribute sets at play. Oh well. Only handling the checks would miss running some of those integration tests.

wait_for_job was removed in https://github.com/NixOS/nixpkgs/commit/884c63fca9936fe06d00237bfeb7616f868c6d86

(Based on commit f5c9d19c9051de85eced0cff79d63c66db7af73c)

Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>

There is an additional issue, where Lix seems to have lost the ability to use extra- options. See: lix-project/lix#1183.

This is affecting the integration test suite. So a workaround was added in this PR.

And on top of that, there is something fishy with the Gitea test. I don't know if it's correct that the statuses can be in a different order than expected. Though the NixOS Hydra sidestream seems to think it's fine.

The first change is *trivial enough* that the credit is not needed, but I believe it's appropriate to cross-reference here. An attempt was made at `git cherry-pick -x`, but other changes were conflicting. So the changes were undone and the same logical changes (`%s/wait_for_job/wait_for_unit/g`) were made. (currently being) Checked with: ``` nix-build --expr ' with import ./.; let pick = builtins.mapAttrs (_: v: v.${builtins.currentSystem}); in builtins.concatLists ( map builtins.attrValues ( builtins.attrValues ( pick { tests.${builtins.currentSystem} = pick hydraJobs.tests; inherit checks packages; } ) ) ) ' ``` This is inelegant since the interface used with the Flake here is awkward, when wanting to run all `hydraJobs.tests`, since the lack of `${builtins.currentSystem}` is leaking at different levels regarding the attribute sets at play. Oh well. Only handling the `checks` would miss running some of those integration tests. > ``` > wait_for_job was removed in https://github.com/NixOS/nixpkgs/commit/884c63fca9936fe06d00237bfeb7616f868c6d86 > > (Based on commit f5c9d19c9051de85eced0cff79d63c66db7af73c) > > Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com> > ``` * * * There is an additional issue, where Lix seems to have lost the ability to use `extra-` options. See: https://git.lix.systems/lix-project/lix/issues/1183. This is affecting the integration test suite. So a workaround was added in this PR. * * * And *on top of that*, there is something fishy with the Gitea test. I don't know if it's *correct* that the statuses can be in a different order than expected. Though the NixOS Hydra sidestream seems to think it's fine.

samueldr-at-cyberus added 1 commit

2026-06-10 16:32:24 +00:00

nixos-tests: wait_for_job -> wait_for_unit c9bb8daf24

wait_for_job was removed in 884c63fca9

(Based on commit f5c9d19c9051de85eced0cff79d63c66db7af73c)

Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com>

samueldr-at-cyberus changed title from ~~nixos-tests: wait_for_job -> wait_for_unit~~ to WIP: nixos-tests: wait_for_job -> wait_for_unit

2026-06-10 16:32:43 +00:00

samueldr-at-cyberus force-pushed fix/nixos-tests.nix from c9bb8daf24 to 76d65cf653

2026-06-10 21:23:31 +00:00

Compare

samueldr-at-cyberus force-pushed fix/nixos-tests.nix from 76d65cf653 to 8131422873

2026-06-12 21:51:42 +00:00

Compare

samueldr-at-cyberus commented

2026-06-12 21:54:49 +00:00

Author

Contributor

This took a hot minute to figure out, but there was more to fix than just that.

The TLDR is that lix-project/lix#1183 is affecting the integration test suite. So a workaround was added in this PR.

This took a hot minute to figure out, but there was *more* to fix than just that. The TLDR is that https://git.lix.systems/lix-project/lix/issues/1183 is affecting the integration test suite. So a workaround was added in this PR. And *on top of that*, there is something fishy with the Gitea test. I don't know if it's *correct* that the statuses can be in a different order than expected. Though the NixOS Hydra sidestream seems to think it's fine.

samueldr-at-cyberus changed title from ~~WIP: nixos-tests: wait_for_job -> wait_for_unit~~ to nixos-tests: Fix all tests

2026-06-12 21:55:07 +00:00