зеркало из https://github.com/microsoft/git.git
Merge branch 'tg/t5570-drop-racy-test'
An inherently racy test that caused intermittent failures has been removed. * tg/t5570-drop-racy-test: Revert "t/lib-git-daemon: record daemon log" t5570: drop racy test
This commit is contained in:
Коммит
9462ac7211
|
@ -54,19 +54,11 @@ start_git_daemon() {
|
|||
"$@" "$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" &&
|
||||
printf "%s\n" "$line" >&4
|
||||
cat <&7 >&4 &
|
||||
} 7<git_daemon_output &&
|
||||
|
||||
# Check expected output
|
||||
if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble"
|
||||
|
|
|
@ -183,19 +183,6 @@ test_expect_success 'hostname cannot break out of directory' '
|
|||
git ls-remote "$GIT_DAEMON_URL/escape.git"
|
||||
'
|
||||
|
||||
test_expect_success 'daemon log records all attributes' '
|
||||
cat >expect <<-\EOF &&
|
||||
Extended attribute "host": localhost
|
||||
Extended attribute "protocol": version=1
|
||||
EOF
|
||||
>daemon.log &&
|
||||
GIT_OVERRIDE_VIRTUAL_HOST=localhost \
|
||||
git -c protocol.version=1 \
|
||||
ls-remote "$GIT_DAEMON_URL/interp.git" &&
|
||||
grep -i extended.attribute daemon.log | cut -d" " -f2- >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success FAKENC 'hostname interpolation works after LF-stripping' '
|
||||
{
|
||||
printf "git-upload-pack /interp.git\n\0host=localhost" | packetize
|
||||
|
|
Загрузка…
Ссылка в новой задаче