kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jt/t5500-unflake' 

Test fix for a topic already in 'master' and meant for 'maint'.

* jt/t5500-unflake:
  t5500: count objects through stderr, not trace
maint
Junio C Hamano 2020-05-14 14:39:45 -07:00
parent 6baba94afc 2b695ecd74
commit ac140beebe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/t5500-fetch-pack.sh
View File

@ -386,7 +386,7 @@ test_expect_success 'clone shallow with packed refs' '
' '


test_expect_success 'in_vain not triggered before first ACK' ' test_expect_success 'in_vain not triggered before first ACK' '
rm -rf myserver myclient trace && rm -rf myserver myclient &&
git init myserver && git init myserver &&
test_commit -C myserver foo && test_commit -C myserver foo &&
git clone "file://$(pwd)/myserver" myclient && git clone "file://$(pwd)/myserver" myclient &&
@ -399,12 +399,12 @@ test_expect_success 'in_vain not triggered before first ACK' '
# The new commit that the client wants to fetch. # The new commit that the client wants to fetch.
test_commit -C myserver bar && test_commit -C myserver bar &&


GIT_TRACE_PACKET="$(pwd)/trace" git -C myclient fetch --progress origin && git -C myclient fetch --progress origin 2>log &&
test_i18ngrep "Total 3 " trace test_i18ngrep "remote: Total 3 " log
' '


test_expect_success 'in_vain resetted upon ACK' ' test_expect_success 'in_vain resetted upon ACK' '
rm -rf myserver myclient trace && rm -rf myserver myclient &&
git init myserver && git init myserver &&


# Linked list of commits on master. The first is common; the rest are # Linked list of commits on master. The first is common; the rest are
@ -429,8 +429,8 @@ test_expect_success 'in_vain resetted upon ACK' '
# first. The 256th commit is common between the client and the server, # first. The 256th commit is common between the client and the server,
# and should reset in_vain. This allows negotiation to continue until # and should reset in_vain. This allows negotiation to continue until
# the client reports that first_anotherbranch_commit is common. # the client reports that first_anotherbranch_commit is common.
GIT_TRACE_PACKET="$(pwd)/trace" git -C myclient fetch --progress origin master && git -C myclient fetch --progress origin master 2>log &&
test_i18ngrep "Total 3 " trace test_i18ngrep "Total 3 " log
' '


test_expect_success 'fetch in shallow repo unreachable shallow objects' ' test_expect_success 'fetch in shallow repo unreachable shallow objects' '