From: Andrei Rybak <rybak.a.v@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Michael J Gruber" <git@grubix.eu>, "Jeff King" <peff@peff.net>,
"Patrick Steinhardt" <ps@pks.im>,
"Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v2 0/7] t: fix unused files, part 1
Date: Sat, 18 Mar 2023 16:46:39 +0100 [thread overview]
Message-ID: <20230318154646.131344-1-rybak.a.v@gmail.com> (raw)
In-Reply-To: <20230312201520.370234-1-rybak.a.v@gmail.com>
Here's a v2 for various fixes of unused files in t0??? and t1???.
Original cover letter is at
https://lore.kernel.org/git/20230312201520.370234-1-rybak.a.v@gmail.com/T/#m63071efd1e2f876fdcbd0c384130b0ec7859f885
Changes since v1 address Junio's review:
- just don't redirect output of mktree in patch 3/7
- rewritten commit message of patch 6/7, where I'd completely misunderstood
the code of the tests.
Range diff:
1: 017f1d8173 = 1: 59a868c0b8 t1005: assert output of ls-files
2: 7a75864e00 = 2: a3514687ad t1006: assert error output of cat-file
3: e23a16e560 ! 3: 4cb07fa965 t1010: assert empty output of mktree
@@ Metadata
Author: Andrei Rybak <rybak.a.v@gmail.com>
## Commit message ##
- t1010: assert empty output of mktree
+ t1010: don't create unused files
Builtin "git mktree" writes the the object name of the tree object built
to the standard output. Tests 'mktree refuses to read ls-tree -r output
@@ Commit message
"t1010-mktree.sh" redirect output of "git mktree" to a file, but don't
use its contents in assertions.
- Assert that the output of "git mktree" is empty when it refuses to build
- a tree object.
+ Don't redirect output of "git mktree" to file "actual" in tests that
+ assert that an invocation of "git mktree" must fail.
+
+ Output of "git mktree" is empty when it refuses to build a tree object.
+ So, alternatively, the test could assert that the output is empty.
+ However, there isn't a good reason for the user to expect the command to
+ be silent in such cases, so we shouldn't enforce it. The user shouldn't
+ use the output of a failing command anyway.
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
@@ t/t1010-mktree.sh: test_expect_success 'allow missing object with --missing' '
test_expect_success 'mktree refuses to read ls-tree -r output (1)' '
- test_must_fail git mktree <all >actual
-+ test_must_fail git mktree <all >actual &&
-+ test_must_be_empty actual
++ test_must_fail git mktree <all
'
test_expect_success 'mktree refuses to read ls-tree -r output (2)' '
- test_must_fail git mktree <all.withsub >actual
-+ test_must_fail git mktree <all.withsub >actual &&
-+ test_must_be_empty actual
++ test_must_fail git mktree <all.withsub
'
test_done
4: 462cfa7025 = 4: 1ed6030a4f t1302: don't create unused file
5: 9fa04e479c = 5: 002942d81c t1400: assert output of update-ref
6: e79566cc32 ! 6: 2e3446fc2f t1404: don't create unused file
@@ Commit message
Some tests in file t1404-update-ref-errors.sh create file "unchanged" as
the expected side for a test_cmp assertion at the end of the test for
- output of "git for-each-ref". The filename conveys the expectation that
- the output won't change between two invocations of "git for-each-ref".
+ output of "git for-each-ref". Test 'no bogus intermediate values during
+ delete' also creates a file named "unchanged" using "git for-each-ref".
+ However, the file isn't used for any assertions in the test. Instead,
+ "git rev-parse" is used to compare the reference with variable $D.
- Test 'no bogus intermediate values during delete' also creates a file
- named "unchanged". However, in this test the reference is being
- deleted, i.e. it _does change_. The file itself isn't used for any
- assertions in the test.
-
- Don't create the unused and slightly misleading file "unchanged".
+ Don't create unused file "unchanged" in test 'no bogus intermediate
+ values during delete' of t1404-update-ref-errors.sh.
Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
7: 5a7df840a8 = 7: e11a7d8e02 t1507: assert output of rev-parse
Andrei Rybak (7):
t1005: assert output of ls-files
t1006: assert error output of cat-file
t1010: don't create unused files
t1302: don't create unused file
t1400: assert output of update-ref
t1404: don't create unused file
t1507: assert output of rev-parse
t/t1005-read-tree-reset.sh | 15 ++++++++++-----
t/t1006-cat-file.sh | 3 ++-
t/t1010-mktree.sh | 4 ++--
t/t1302-repo-version.sh | 2 +-
t/t1400-update-ref.sh | 3 +++
t/t1404-update-ref-errors.sh | 1 -
t/t1507-rev-parse-upstream.sh | 6 ++++--
7 files changed, 22 insertions(+), 12 deletions(-)
--
2.40.0
next prev parent reply other threads:[~2023-03-18 15:47 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-12 20:15 [PATCH v1 0/7] t: fix unused files, part 1 Andrei Rybak
2023-03-12 20:15 ` [PATCH v1 1/7] t1005: assert output of ls-files Andrei Rybak
2023-03-14 8:51 ` Michael J Gruber
2023-03-18 15:17 ` Andrei Rybak
2023-03-12 20:15 ` [PATCH v1 1/1] t1507: assert output of rev-parse Andrei Rybak
2023-03-12 20:24 ` Andrei Rybak
2023-03-12 20:15 ` [PATCH v1 2/7] t1006: assert error output of cat-file Andrei Rybak
2023-03-12 20:15 ` [PATCH v1 3/7] t1010: assert empty output of mktree Andrei Rybak
2023-03-13 21:38 ` Junio C Hamano
2023-03-12 20:15 ` [PATCH v1 4/7] t1302: don't create unused file Andrei Rybak
2023-03-12 20:15 ` [PATCH v1 5/7] t1400: assert output of update-ref Andrei Rybak
2023-03-12 20:15 ` [PATCH v1 6/7] t1404: don't create unused file Andrei Rybak
2023-03-13 21:56 ` Junio C Hamano
2023-03-12 20:15 ` [PATCH v1 7/7] t1507: assert output of rev-parse Andrei Rybak
2023-03-13 22:41 ` [PATCH v1 0/7] t: fix unused files, part 1 Junio C Hamano
2023-03-14 20:43 ` Andrei Rybak
2023-03-18 15:46 ` Andrei Rybak [this message]
2023-03-18 15:46 ` [PATCH v2 1/7] t1005: assert output of ls-files Andrei Rybak
2023-03-18 15:46 ` [PATCH v2 2/7] t1006: assert error output of cat-file Andrei Rybak
2023-03-18 15:46 ` [PATCH v2 3/7] t1010: don't create unused files Andrei Rybak
2023-03-18 15:46 ` [PATCH v2 4/7] t1302: don't create unused file Andrei Rybak
2023-03-18 15:46 ` [PATCH v2 5/7] t1400: assert output of update-ref Andrei Rybak
2023-03-18 15:46 ` [PATCH v2 6/7] t1404: don't create unused file Andrei Rybak
2023-03-18 15:46 ` [PATCH v2 7/7] t1507: assert output of rev-parse Andrei Rybak
2023-03-24 20:54 ` [PATCH v3 0/7] t: fix unused files, part 1 Andrei Rybak
2023-03-24 20:54 ` [PATCH v3 1/7] t1005: assert output of ls-files Andrei Rybak
2023-03-24 20:54 ` [PATCH v3 2/7] t1006: assert error output of cat-file Andrei Rybak
2023-03-24 20:54 ` [PATCH v3 3/7] t1010: don't create unused files Andrei Rybak
2023-03-24 20:54 ` [PATCH v3 4/7] t1302: don't create unused file Andrei Rybak
2023-03-24 20:54 ` [PATCH v3 5/7] t1400: assert output of update-ref Andrei Rybak
2023-03-24 20:54 ` [PATCH v3 6/7] t1404: don't create unused file Andrei Rybak
2023-03-24 20:54 ` [PATCH v3 7/7] t1507: assert output of rev-parse Andrei Rybak
2023-03-28 17:37 ` [PATCH v3 0/7] t: fix unused files, part 1 Junio C Hamano
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=20230318154646.131344-1-rybak.a.v@gmail.com \
--to=rybak.a.v@gmail.com \
--cc=avarab@gmail.com \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=ps@pks.im \
/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).