From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Jiang Xin" <zhiyou.jx@alibaba-inc.com>,
"Taylor Blau" <me@ttaylorr.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 0/2] bundle tests: modernize, fix missing coverage & test_cmp
Date: Thu, 22 Jul 2021 01:53:27 +0200 [thread overview]
Message-ID: <cover-0.2-00000000000-20210721T235251Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.2-00000000000-20210720T115052Z-avarab@gmail.com>
A trivial series to improve the bundle tests a bit. This is split off
from some larger changes to "git bundle" I have cooking, where the
"test_cmp" in 2/2 helped assert & catch regressions.
Ævar Arnfjörð Bjarmason (2):
bundle tests: use ">file" not ": >file"
bundle tests: use test_cmp instead of grep
t/t5607-clone-bundle.sh | 72 ++++++++++++++++++++++++++++++++---------
1 file changed, 56 insertions(+), 16 deletions(-)
Range-diff against v1:
1: 746d727113b ! 1: 2a77f80725d bundle tests: use ">file" not ": >file"
@@ Metadata
## Commit message ##
bundle tests: use ">file" not ": >file"
- Change redundant uses of ":" on the LHS of a ">" to the more commonly
- use ">file" pattern.
+ Change uses of ":" on the LHS of a ">" to the more commonly used
+ ">file" pattern in t/t5607-clone-bundle.sh.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
2: 062f34abf1a ! 2: d5504fd764c bundle tests: use test_cmp instead of grep
@@ t/t5607-clone-bundle.sh: test_expect_success 'ridiculously long subject in bound
- sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary &&
- grep "^-$OID_REGEX " boundary
+
-+ cat >expect.common <<-EOF &&
++ if ! test_have_prereq SHA1
++ then
++ echo "@object-format=sha256"
++ fi >expect &&
++ cat >>expect <<-EOF &&
+ -$(git log --pretty=format:"%H %s" -1 HEAD^)
+ $(git rev-parse HEAD) HEAD
+ EOF
++
+ if test_have_prereq SHA1
+ then
-+ cp expect.common expect
-+ else
-+ echo @object-format=sha256 >expect
-+ cat expect.common >>expect
-+ fi &&
-+ if test_have_prereq SHA1
-+ then
-+ head -n 3 long-subject-bundle.bdl >bundle-header
++ head -n 3 long-subject-bundle.bdl
+ else
-+ head -n 4 long-subject-bundle.bdl >bundle-header
-+ fi &&
-+ grep -v "^#" bundle-header >actual &&
++ head -n 4 long-subject-bundle.bdl
++ fi | grep -v "^#" >actual &&
++
+ test_cmp expect actual
'
--
2.32.0.955.ge7c5360f7e7
next prev parent reply other threads:[~2021-07-21 23:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 11:52 [PATCH 0/2] bundle tests: modernize, fix missing coverage & test_cmp Ævar Arnfjörð Bjarmason
2021-07-20 11:52 ` [PATCH 1/2] bundle tests: use ">file" not ": >file" Ævar Arnfjörð Bjarmason
2021-07-20 19:57 ` Junio C Hamano
2021-07-20 20:57 ` Felipe Contreras
2021-07-20 11:52 ` [PATCH 2/2] bundle tests: use test_cmp instead of grep Ævar Arnfjörð Bjarmason
2021-07-20 17:16 ` Taylor Blau
2021-07-21 23:53 ` Ævar Arnfjörð Bjarmason
2021-07-22 18:13 ` Taylor Blau
2021-07-20 17:18 ` [PATCH 0/2] bundle tests: modernize, fix missing coverage & test_cmp Taylor Blau
2021-07-21 23:53 ` Ævar Arnfjörð Bjarmason [this message]
2021-07-21 23:53 ` [PATCH v2 1/2] bundle tests: use ">file" not ": >file" Ævar Arnfjörð Bjarmason
2021-07-21 23:53 ` [PATCH v2 2/2] bundle tests: use test_cmp instead of grep Ævar Arnfjörð Bjarmason
2021-07-22 18:17 ` Taylor Blau
2021-07-22 18:17 ` [PATCH v2 0/2] bundle tests: modernize, fix missing coverage & test_cmp Taylor Blau
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=cover-0.2-00000000000-20210721T235251Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=me@ttaylorr.com \
--cc=zhiyou.jx@alibaba-inc.com \
/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).