Skip to content

[backport 2.4] Recent merged testsuite improvements#5755

Merged
edolstra merged 2 commits intoNixOS:2.4-maintenancefrom
obsidiansystems:2.4-improve-tests
Dec 15, 2021
Merged

[backport 2.4] Recent merged testsuite improvements#5755
edolstra merged 2 commits intoNixOS:2.4-maintenancefrom
obsidiansystems:2.4-improve-tests

Conversation

@Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Dec 9, 2021

No description provided.

thufschmitt and others added 2 commits December 9, 2021 16:10
Having the `post-build-hook` use `nix` from the client package can lead
to a deadlock in case there’s a db migration to do between both, as a
`nix` command running inside the hook will run as root (and as such will
bypass the daemon), so might trigger a db migration, which will get
stuck trying to get a global lock on the DB (as the daemon that ran the
hook already has a lock on it).

(cherry picked from commit 93eadd5)
The eventual PATH entry needs the `.../bin` or we will not use the right
daemon.

(cherry picked from commit 06fb6ae)
@edolstra
Copy link
Member

edolstra commented Dec 9, 2021

IMHO backport PRs should be made after the master PR has been merged (via git cherry-pick -x). Otherwise there is a risk that we end up merging something that isn't on master or has diverged from the master PR.

@Ericson2314
Copy link
Member Author

Yeah sorry, I got eager and thought those were about to pass, and wanted to make sure the cross-version testing works.

@Ericson2314 Ericson2314 marked this pull request as ready for review December 9, 2021 19:32
@Ericson2314
Copy link
Member Author

Ericson2314 commented Dec 9, 2021

@edolstra this is now limited to the first two commits which were already merged.

@Ericson2314 Ericson2314 changed the title [backport 2.4] Recent testsuite improvements [backport 2.4] Recent Merged testsuite improvements Dec 10, 2021
@Ericson2314 Ericson2314 changed the title [backport 2.4] Recent Merged testsuite improvements [backport 2.4] Recent merged testsuite improvements Dec 10, 2021
@Ericson2314
Copy link
Member Author

@edolstra ping

@edolstra edolstra merged commit 46a9595 into NixOS:2.4-maintenance Dec 15, 2021
@Ericson2314 Ericson2314 deleted the 2.4-improve-tests branch December 15, 2021 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants