mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
4c2eb06419
Test scripts checking 'git daemon' stop the daemon with a TERM signal, and the 'stop_git_daemon' helper checks the daemon's exit status to make sure that it indeed died because of that signal. This check is bogus since03c39b3458(t/lib-git-daemon: use test_match_signal, 2016-06-24), for two reasons: - Right after killing 'git daemon', 'stop_git_daemon' saves its exit status in a variable, but since03c39b3458the condition checking the exit status looks at '$?', which at this point is not the exit status of 'git daemon', but that of the variable assignment, i.e. it's always 0. - The unexpected exit status should abort the whole test script with 'error', but it doesn't, because03c39b3458forgot to negate 'test_match_signal's exit status in the condition. This patch fixes both issues. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
123 lines
2.7 KiB
Bash
123 lines
2.7 KiB
Bash
# Shell library to run git-daemon in tests. Ends the test early if
|
|
# GIT_TEST_GIT_DAEMON is not set.
|
|
#
|
|
# Usage:
|
|
#
|
|
# . ./test-lib.sh
|
|
# . "$TEST_DIRECTORY"/lib-git-daemon.sh
|
|
# start_git_daemon
|
|
#
|
|
# test_expect_success '...' '
|
|
# ...
|
|
# '
|
|
#
|
|
# test_expect_success ...
|
|
#
|
|
# stop_git_daemon
|
|
# test_done
|
|
|
|
test_tristate GIT_TEST_GIT_DAEMON
|
|
if test "$GIT_TEST_GIT_DAEMON" = false
|
|
then
|
|
skip_all="git-daemon testing disabled (unset GIT_TEST_GIT_DAEMON to enable)"
|
|
test_done
|
|
fi
|
|
|
|
if test_have_prereq !PIPE
|
|
then
|
|
test_skip_or_die $GIT_TEST_GIT_DAEMON "file system does not support FIFOs"
|
|
fi
|
|
|
|
LIB_GIT_DAEMON_PORT=${LIB_GIT_DAEMON_PORT-${this_test#t}}
|
|
|
|
GIT_DAEMON_PID=
|
|
GIT_DAEMON_DOCUMENT_ROOT_PATH="$PWD"/repo
|
|
GIT_DAEMON_HOST_PORT=127.0.0.1:$LIB_GIT_DAEMON_PORT
|
|
GIT_DAEMON_URL=git://$GIT_DAEMON_HOST_PORT
|
|
|
|
start_git_daemon() {
|
|
if test -n "$GIT_DAEMON_PID"
|
|
then
|
|
error "start_git_daemon already called"
|
|
fi
|
|
|
|
mkdir -p "$GIT_DAEMON_DOCUMENT_ROOT_PATH"
|
|
|
|
trap 'code=$?; stop_git_daemon; (exit $code); die' EXIT
|
|
|
|
say >&3 "Starting git daemon ..."
|
|
mkfifo git_daemon_output
|
|
${LIB_GIT_DAEMON_COMMAND:-git daemon} \
|
|
--listen=127.0.0.1 --port="$LIB_GIT_DAEMON_PORT" \
|
|
--reuseaddr --verbose \
|
|
--base-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
|
|
"$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
|
|
>&3 2>git_daemon_output &
|
|
GIT_DAEMON_PID=$!
|
|
>daemon.log
|
|
{
|
|
read -r line <&7
|
|
printf "%s\n" "$line"
|
|
printf >&4 "%s\n" "$line"
|
|
(
|
|
while read -r line <&7
|
|
do
|
|
printf "%s\n" "$line"
|
|
printf >&4 "%s\n" "$line"
|
|
done
|
|
) &
|
|
} 7<git_daemon_output >>"$TRASH_DIRECTORY/daemon.log" &&
|
|
|
|
# Check expected output
|
|
if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble"
|
|
then
|
|
kill "$GIT_DAEMON_PID"
|
|
wait "$GIT_DAEMON_PID"
|
|
trap 'die' EXIT
|
|
test_skip_or_die $GIT_TEST_GIT_DAEMON \
|
|
"git daemon failed to start"
|
|
fi
|
|
}
|
|
|
|
stop_git_daemon() {
|
|
if test -z "$GIT_DAEMON_PID"
|
|
then
|
|
return
|
|
fi
|
|
|
|
trap 'die' EXIT
|
|
|
|
# kill git-daemon child of git
|
|
say >&3 "Stopping git daemon ..."
|
|
kill "$GIT_DAEMON_PID"
|
|
wait "$GIT_DAEMON_PID" >&3 2>&4
|
|
ret=$?
|
|
if ! test_match_signal 15 $ret
|
|
then
|
|
error "git daemon exited with status: $ret"
|
|
fi
|
|
GIT_DAEMON_PID=
|
|
rm -f git_daemon_output
|
|
}
|
|
|
|
# A stripped-down version of a netcat client, that connects to a "host:port"
|
|
# given in $1, sends its stdin followed by EOF, then dumps the response (until
|
|
# EOF) to stdout.
|
|
fake_nc() {
|
|
if ! test_declared_prereq FAKENC
|
|
then
|
|
echo >&4 "fake_nc: need to declare FAKENC prerequisite"
|
|
return 127
|
|
fi
|
|
perl -Mstrict -MIO::Socket::INET -e '
|
|
my $s = IO::Socket::INET->new(shift)
|
|
or die "unable to open socket: $!";
|
|
print $s <STDIN>;
|
|
$s->shutdown(1);
|
|
print <$s>;
|
|
' "$@"
|
|
}
|
|
|
|
test_lazy_prereq FAKENC '
|
|
perl -MIO::Socket::INET -e "exit 0"
|
|
'
|