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

tests: Fix the start of the daemon

Browse source 
- Make sure that it starts even without the `nix-command` xp feature
- Fail if it doesn’t manage to start

This fixes a 30s wait for every test in `init.sh` as the daemon couldn’t
start, but the code was just waiting 30s and continuing as if everything
was all right.
This commit is contained in:
regnat 2022-02-28 14:41:09 +01:00
parent b592359c56
commit b8f8aef9d3
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/common.sh.in
View file

@ -90,12 +90,18 @@ startDaemon() {
# Start the daemon, wait for the socket to appear. !!! # Start the daemon, wait for the socket to appear. !!!
# ‘nix-daemon’ should have an option to fork into the background. # ‘nix-daemon’ should have an option to fork into the background.
rm -f $NIX_DAEMON_SOCKET_PATH rm -f $NIX_DAEMON_SOCKET_PATH
PATH=$DAEMON_PATH nix daemon & PATH=$DAEMON_PATH nix-daemon&
pidDaemon=$!
for ((i = 0; i < 300; i++)); do for ((i = 0; i < 300; i++)); do
if [[ -S $NIX_DAEMON_SOCKET_PATH ]]; then break; fi if [[ -S $NIX_DAEMON_SOCKET_PATH ]]; then
DAEMON_STARTED=1
break;
fi
sleep 0.1 sleep 0.1
done done
pidDaemon=$! if [[ -z ${DAEMON_STARTED+x} ]]; then
fail "Didn’t manage to start the daemon"
fi
trap "killDaemon" EXIT trap "killDaemon" EXIT
export NIX_REMOTE=daemon export NIX_REMOTE=daemon
} }