summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-18 21:49:55 (GMT)
commit9462ac7211492ace965b6b51bf8060f01d829f2d (patch)
tree7998dfb82b5327f5f96b0b1f0cf5ead27be65a6a
parent74ae0652c4736629db9c97f7a3ac7cebedaeae10 (diff)
parent3c78e97d5d553aa880cdaed2b51610595162dac4 (diff)
downloadgit-9462ac7211492ace965b6b51bf8060f01d829f2d.zip
git-9462ac7211492ace965b6b51bf8060f01d829f2d.tar.gz
git-9462ac7211492ace965b6b51bf8060f01d829f2d.tar.bz2
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
-rw-r--r--t/lib-git-daemon.sh14
-rwxr-xr-xt/t5570-git-daemon.sh13
2 files changed, 3 insertions, 24 deletions
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
index f98de95..fd41229 100644
--- a/t/lib-git-daemon.sh
+++ b/t/lib-git-daemon.sh
@@ -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"
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index 7466aad..58ee787 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -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