Skip to content

Commit 561b133

Browse files
Clemens Buchachergitster
Clemens Buchacher
authored andcommitted
git-daemon tests: wait until daemon is ready
In start_daemon, git-daemon is started as a background process. In theory, the tests may try to connect before the daemon had a chance to open a listening socket. Avoid this race condition by waiting for it to output "Ready to rumble". Any other output is considered an error and the test is aborted. Should git-daemon produce no output at all, lib-git-daemon would block forever. This could be fixed by introducing a timeout. On the other hand, we have no timeout for other git commands which could suffer from the same problem. Since such a mechanism adds some complexity, I have decided against it. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f6a34cf commit 561b133

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

t/lib-git-daemon.sh

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,27 @@ start_git_daemon() {
2323
trap 'code=$?; stop_git_daemon; (exit $code); die' EXIT
2424

2525
say >&3 "Starting git daemon ..."
26+
mkfifo git_daemon_output
2627
git daemon --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
2728
--reuseaddr --verbose \
2829
--base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
2930
"$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
30-
>&3 2>&4 &
31+
>&3 2>git_daemon_output &
3132
GIT_DAEMON_PID=$!
33+
{
34+
read line
35+
echo >&4 "$line"
36+
cat >&4 &
37+
38+
# Check expected output
39+
if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble"
40+
then
41+
kill "$GIT_DAEMON_PID"
42+
wait "$GIT_DAEMON_PID"
43+
trap 'die' EXIT
44+
error "git daemon failed to start"
45+
fi
46+
} <git_daemon_output
3247
}
3348

3449
stop_git_daemon() {
@@ -50,4 +65,5 @@ stop_git_daemon() {
5065
error "git daemon exited with status: $ret"
5166
fi
5267
GIT_DAEMON_PID=
68+
rm -f git_daemon_output
5369
}

0 commit comments

Comments
 (0)