lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

tests/flake-registry: Fix occasional deadlocks

Browse source 
This seems to have been caused by having the wrong PID. I don't know why
it worked before in the sandbox, but the code was definitely wrong
before, so let's just fix it.

Change-Id: I556580bdf614c716566310e975a36daa6d6c9a91
This commit is contained in:
jade 2024-06-10 21:34:03 -07:00
parent 59b5965bbf
commit 73898cad0e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/functional/flakes/flake-registry.sh
View file

@ -22,6 +22,7 @@ nix registry list | grep '^global flake:home-manager'
set -m set -m
# port 0: auto pick a free port, unbufferred output # port 0: auto pick a free port, unbufferred output
python3 -u -m http.server 0 --bind 127.0.0.1 > server.out & python3 -u -m http.server 0 --bind 127.0.0.1 > server.out &
# wait for the http server to admit it is working # wait for the http server to admit it is working
while ! grep -qP 'port \d+' server.out ; do while ! grep -qP 'port \d+' server.out ; do
echo 'waiting for python http' >&2 echo 'waiting for python http' >&2
@ -69,4 +70,4 @@ nix registry list | grep '^global flake:private-flake'
# make sure we have a warning: # make sure we have a warning:
nix registry list 2>&1 | grep "config option flake-registry referring to a URL is deprecated and will be removed" nix registry list 2>&1 | grep "config option flake-registry referring to a URL is deprecated and will be removed"
kill %1 kill %python