From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>, Johannes.Schindelin@gmx.de
Subject: [PATCH] t5500: count objects through stderr, not trace
Date: Wed, 6 May 2020 15:07:40 -0700 [thread overview]
Message-ID: <20200506220741.71021-1-jonathantanmy@google.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2005062304410.56@tvgsbejvaqbjf.bet>
In two tests introduced by 4fa3f00abb ("fetch-pack: in protocol v2,
in_vain only after ACK", 2020-04-28) and 2f0a093dd6 ("fetch-pack: in
protocol v2, reset in_vain upon ACK", 2020-04-28), the count of objects
downloaded is checked by grepping for a specific message in the packet
trace. However, this is flaky as that specific message may be delivered
over 2 or more packet lines.
Instead, grep over stderr, just like the "fetch creating new shallow
root" test in the same file.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
Thanks, Dscho. The commits introducing the flakiness have made it to
master, so this commit is on master.
---
t/t5500-fetch-pack.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 52dd1a688c..8c54e34ef1 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -386,7 +386,7 @@ test_expect_success 'clone shallow with packed refs' '
'
test_expect_success 'in_vain not triggered before first ACK' '
- rm -rf myserver myclient trace &&
+ rm -rf myserver myclient &&
git init myserver &&
test_commit -C myserver foo &&
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.
test_commit -C myserver bar &&
- GIT_TRACE_PACKET="$(pwd)/trace" git -C myclient fetch --progress origin &&
- test_i18ngrep "Total 3 " trace
+ git -C myclient fetch --progress origin 2>log &&
+ test_i18ngrep "remote: Total 3 " log
'
test_expect_success 'in_vain resetted upon ACK' '
- rm -rf myserver myclient trace &&
+ rm -rf myserver myclient &&
git init myserver &&
# 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,
# and should reset in_vain. This allows negotiation to continue until
# the client reports that first_anotherbranch_commit is common.
- GIT_TRACE_PACKET="$(pwd)/trace" git -C myclient fetch --progress origin master &&
- test_i18ngrep "Total 3 " trace
+ git -C myclient fetch --progress origin master 2>log &&
+ test_i18ngrep "Total 3 " log
'
test_expect_success 'fetch in shallow repo unreachable shallow objects' '
--
2.26.2.526.g744177e7f7-goog
next prev parent reply other threads:[~2020-05-06 22:07 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-25 0:56 [PATCH 0/2] Protocol v2 in_vain fixes Jonathan Tan
2020-04-25 0:56 ` [PATCH 1/2] fetch-pack: in protocol v2, in_vain only after ACK Jonathan Tan
2020-04-25 5:08 ` Junio C Hamano
2020-04-26 0:28 ` Jonathan Nieder
2020-04-27 17:27 ` Jonathan Tan
2020-04-27 22:16 ` Junio C Hamano
2020-04-25 0:56 ` [PATCH 2/2] fetch-pack: in protocol v2, reset in_vain upon ACK Jonathan Tan
2020-04-26 1:10 ` Jonathan Nieder
2020-04-27 17:28 ` Jonathan Tan
2020-04-28 0:01 ` [PATCH v2 0/3] Protocol v2 in_vain fixes Jonathan Tan
2020-04-28 0:01 ` [PATCH v2 1/3] fetch-pack: return enum from process_acks() Jonathan Tan
2020-04-28 0:53 ` Jonathan Nieder
2020-04-28 16:54 ` Junio C Hamano
2020-04-28 18:00 ` Michal Suchánek
2020-04-28 19:17 ` Junio C Hamano
2020-04-28 0:01 ` [PATCH v2 2/3] fetch-pack: in protocol v2, in_vain only after ACK Jonathan Tan
2020-04-28 0:54 ` Jonathan Nieder
2020-05-06 21:08 ` Johannes Schindelin
2020-05-06 22:07 ` Jonathan Tan [this message]
2020-05-06 22:28 ` [PATCH] t5500: count objects through stderr, not trace Junio C Hamano
2020-05-06 22:40 ` Junio C Hamano
2020-05-07 14:35 ` Johannes Schindelin
2020-10-13 14:45 ` Johannes Schindelin
2020-04-28 0:01 ` [PATCH v2 3/3] fetch-pack: in protocol v2, reset in_vain upon ACK Jonathan Tan
2020-04-28 0:55 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200506220741.71021-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).