Remove the right socket before starting the daemon

For some reason, an old socket occasionally stays here on OSX, causing
the subsequent tests to fail
This commit is contained in:
regnat 2021-07-27 11:12:32 +02:00
parent addacfce4a
commit c2c0dba792

View file

@ -88,10 +88,10 @@ startDaemon() {
fi fi
# 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_STATE_DIR/daemon-socket/socket rm -f $NIX_DAEMON_SOCKET_PATH
${NIX_DAEMON_COMMAND:-nix daemon} & ${NIX_DAEMON_COMMAND:-nix daemon} &
for ((i = 0; i < 30; i++)); do for ((i = 0; i < 30; i++)); do
if [ -e $NIX_DAEMON_SOCKET_PATH ]; then break; fi if [[ -S $NIX_DAEMON_SOCKET_PATH ]]; then break; fi
sleep 1 sleep 1
done done
pidDaemon=$! pidDaemon=$!