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

testS: poll more eagerly for the daemon start/stop

Browse source 
Polling every 1 second means that even the simplest test takes at least
2 seconds. We can reasonably poll 1/10 of that to make things much
  quicker (esp. given that most of the time 0.1s is enough for the
  daemon to be started or stopped)
This commit is contained in:
regnat 2022-02-24 14:57:27 +01:00
parent 6524eb4b77
commit 9c470cb969
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/common.sh.in
View file

@ -91,9 +91,9 @@ startDaemon() {
# ‘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 &
for ((i = 0; i < 30; 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 break; fi
sleep 1 sleep 0.1
done done
pidDaemon=$! pidDaemon=$!
trap "killDaemon" EXIT trap "killDaemon" EXIT
@ -102,9 +102,9 @@ startDaemon() {
killDaemon() { killDaemon() {
kill $pidDaemon kill $pidDaemon
for i in {0.10}; do for i in {0..100}; do
kill -0 $pidDaemon || break kill -0 $pidDaemon || break
sleep 1 sleep 0.1
done done
kill -9 $pidDaemon || true kill -9 $pidDaemon || true
wait $pidDaemon || true wait $pidDaemon || true