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>
Clemens Buchacher committed
Jan 7, 2012 at 12:42 UTC
561b133c2c29ccf5e2aeaa5d6b1da3835e660db8
1 file changed
+17
-1
t/lib-git-daemon.sh
+17
-1
@@ -23,12 +23,27 @@ start_git_daemon() {
23
trap 'code=$?; stop_git_daemon; (exit $code); die' EXIT
24
25
say >&3 "Starting git daemon ..."
26
+ mkfifo git_daemon_output
27
git daemon --listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
28
--reuseaddr --verbose \
29
--base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
30
"$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
30
- >&3 2>&4 &
31
+ >&3 2>git_daemon_output &
32
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
47
}
48
49
stop_git_daemon() {
@@ -50,4 +65,5 @@ stop_git_daemon() {
65
error "git daemon exited with status: $ret"
66
fi
67
GIT_DAEMON_PID=
68
+ rm -f git_daemon_output
69
}