nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-10 20:46:01 +01:00
Code 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)

(cherry picked from commit 9c470cb969)
This commit is contained in:
regnat 2022-02-24 14:57:27 +01:00 • committed by John Ericson
parent 196670af76
commit ddbb122df1
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/common.sh.in
View file

@ -92,9 +92,9 @@ startDaemon() {
rm -f $NIX_DAEMON_SOCKET_PATH rm -f $NIX_DAEMON_SOCKET_PATH
PATH=$DAEMON_PATH nix-daemon & PATH=$DAEMON_PATH nix-daemon &
pidDaemon=$! pidDaemon=$!
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
trap "killDaemon" EXIT trap "killDaemon" EXIT
# Save for if daemon is killed # Save for if daemon is killed
@ -104,9 +104,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