From: Khalid Masum <khalid.masum.92@gmail.com>
To: khalid.masum.92@gmail.com
Cc: git@vger.kernel.org, gitgitgadget@gmail.com,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v4 0/1][GSoC] t3501: remove test -f and stop ignoring git <cmd> exit code
Date: Tue, 5 Apr 2022 13:47:41 +0000 [thread overview]
Message-ID: <20220405134742.17526-1-khalid.masum.92@gmail.com> (raw)
In-Reply-To: <20220402192415.19023-1-khalid.masum.92@gmail.com>
T3501 contains two test cases where we used to check if a file exists using
test -f which is not necessary because we already have helper function for
it. In fact in one test case test -f is redundant because we grep right
after it. Also the use of git rev-parse can cause segfault.
This patch tries to resolve these two issues in T3501.
Khalid Masum (1):
t3501: remove test -f and stop ignoring git <cmd> exit code
t/t3501-revert-cherry-pick.sh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
Range-diff against v3:
1: aeb28e3249 ! 1: 1090429b86 t3501: remove redundant file check and stop ignoring git <cmd> exit code
@@
## Metadata ##
-Author: Labnann <khalid.masum.92@gmail.com>
+Author: Khalid Masum <khalid.masum.92@gmail.com>
## Commit message ##
- t3501: remove redundant file check and stop ignoring git <cmd> exit code
+ t3501: remove test -f and stop ignoring git <cmd> exit code
In the test 'cherry-pick after renaming branch', stop checking for
the presence of a file (opos) because we are going to "grep" in it in
@@ Commit message
In the test 'revert after renaming branch', instead of allowing any
random contents as long as a known phrase is not there in it, we can
- expect the exact outcome---after the successful revert of
- "added", the contents of file "spoo" should become identical to
- what was in file "oops" in the "initial" commit.
+ expect the exact outcome---after the successful revert of "added", the
+ contents of file "spoo" should become identical to what was in file
+ "oops" in the "initial" commit. This test also contains 'test -f' that
+ verifies presence of a file, but we have a helper function to do the same
+ thing. Replace it with appropriate helper function 'test_path_is_file'
+ for better readability and better error messages.
- In both tests, we would not notice when "git rev-parse" starts
- segfaulting without emitting any output. The 'test' command would
- end up being just "test =", which yields success. Therefore we could
- use test_cmp_rev
+ In both tests, we will not notice when "git rev-parse" starts segfaulting
+ without emitting any output. The 'test' command will end up being just
+ "test =", which yields success. Use the 'test_cmp_rev' helper to make
+ sure we will notice such a breakage.
- Signed-off-by: Labnann <khalid.masum.92@gmail.com>
+ Signed-off-by: Khalid Masum <khalid.masum.92@gmail.com>
## t/t3501-revert-cherry-pick.sh ##
@@ t/t3501-revert-cherry-pick.sh: test_expect_success 'cherry-pick after renaming branch' '
@@ t/t3501-revert-cherry-pick.sh: test_expect_success 'revert after renaming branch
- test -f spoo &&
- ! grep "Add extra line at the end" spoo &&
+ test_cmp_rev rename1 HEAD^ &&
++ test_path_is_file spoo &&
+ test_cmp_rev initial:oops HEAD:spoo &&
git reflog -1 | grep revert
--
2.35.1.windows.2
next prev parent reply other threads:[~2022-04-05 21:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 21:43 [PATCH] t3501: use test_path_is_* functions Labnan via GitGitGadget
2022-03-30 22:11 ` Ævar Arnfjörð Bjarmason
2022-03-31 19:15 ` [PATCH v2 0/3][GSoC] t3501: remove test and test -f Labnann
2022-03-31 19:15 ` [PATCH v2 1/3] t3501: use test_path_is_* functions Labnann
2022-03-31 19:15 ` [PATCH v2 2/3] t3501: don't ignore "git <cmd>" exit code Labnann
2022-04-01 18:10 ` Junio C Hamano
2022-03-31 19:15 ` [PATCH v2 3/3] t3501: test cherry-pick revert with oids Labnann
2022-04-01 18:24 ` Junio C Hamano
2022-04-02 19:24 ` [PATCH v3 0/1][GSoC] t3501: remove redundant file checking and stop ignoring git <cmd> exit code Labnann
2022-04-02 19:24 ` [PATCH v3 1/1] t3501: remove redundant file check " Labnann
2022-04-04 15:54 ` Junio C Hamano
2022-04-05 13:47 ` Khalid Masum [this message]
2022-04-05 13:47 ` [PATCH v4 1/1] t3501: remove test -f " Khalid Masum
2022-04-05 15:06 ` [PATCH v4 0/1][GSoC] " Khalid Masum
2022-04-05 15:06 ` [PATCH v4 1/1] " Khalid Masum
2022-04-22 11:26 ` [PATCH v2] " Labnan via GitGitGadget
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220405134742.17526-1-khalid.masum.92@gmail.com \
--to=khalid.masum.92@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).