undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tg/t5570-drop-racy-test'

Browse Source 
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:
Junio C Hamano 2019-01-18 13:49:55 -08:00
commit 9462ac7211
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/lib-git-daemon.sh
View File

@ -54,19 +54,11 @@ start_git_daemon() {
"$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \ "$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
>&3 2>git_daemon_output & >&3 2>git_daemon_output &
GIT_DAEMON_PID=$! GIT_DAEMON_PID=$!
>daemon.log
{ {
read -r line <&7 read -r line <&7
printf "%s\n" "$line" printf "%s\n" "$line" >&4
printf >&4 "%s\n" "$line" cat <&7 >&4 &
( } 7<git_daemon_output &&
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 # Check expected output
if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble" if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble"

13
t/t5570-git-daemon.sh
View File

@ -183,19 +183,6 @@ test_expect_success 'hostname cannot break out of directory' '
git ls-remote "$GIT_DAEMON_URL/escape.git" 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' ' test_expect_success FAKENC 'hostname interpolation works after LF-stripping' '
{ {
printf "git-upload-pack /interp.git\n\0host=localhost" | packetize printf "git-upload-pack /interp.git\n\0host=localhost" | packetize