From: "Rohit Ashiwal via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v4 0/1] [GSoC][PATCH] t3600: use test_path_is_* helper functions
Date: Thu, 28 Feb 2019 02:26:48 -0800 (PST) [thread overview]
Message-ID: <pull.152.v4.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.152.v3.git.gitgitgadget@gmail.com>
Replace test -(d|f|e) calls in t3600-rm.sh. Previously we were using test
-(d|f|e) to verify the presence of a directory/file, but we already have
helper functions, viz, test_path_is_dir, test_path_is_file and
test_path_is_missing with better functionality.
Rohit Ashiwal (1):
t3600: use test_path_is_* functions
t/t3600-rm.sh | 160 ++++++++++++++++++++++++++------------------------
1 file changed, 84 insertions(+), 76 deletions(-)
base-commit: 8104ec994ea3849a968b4667d072fedd1e688642
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-152%2Fr1walz%2Frefactor-tests-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-152/r1walz/refactor-tests-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/152
Range-diff vs v3:
1: bfeba25c88 ! 1: f881f01e4f t3600: use test_path_is_* functions
@@ -20,11 +20,48 @@
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@
+ "
test_expect_success \
- 'Post-check that bar does not exist and is not in index after "git rm -f bar"' \
+- 'Pre-check that foo exists and is in index before git rm foo' \
+- '[ -f foo ] && git ls-files --error-unmatch foo'
++ 'Pre-check that foo exists and is in index before git rm foo' '
++ test_path_is_file foo &&
++ git ls-files --error-unmatch foo
++'
+
+ test_expect_success \
+ 'Test that git rm foo succeeds' \
+@@
+ git rm --cached -f foo'
+
+ test_expect_success \
+- 'Post-check that foo exists but is not in index after git rm foo' \
+- '[ -f foo ] && test_must_fail git ls-files --error-unmatch foo'
++ 'Post-check that foo exists but is not in index after git rm foo' '
++ test_path_is_file foo &&
++ test_must_fail git ls-files --error-unmatch foo
++'
+
+ test_expect_success \
+- 'Pre-check that bar exists and is in index before "git rm bar"' \
+- '[ -f bar ] && git ls-files --error-unmatch bar'
++ 'Pre-check that bar exists and is in index before "git rm bar"' '
++ test_path_is_file bar &&
++ git ls-files --error-unmatch bar
++'
+
+ test_expect_success \
+ 'Test that "git rm bar" succeeds' \
+ 'git rm bar'
+
+ test_expect_success \
+- 'Post-check that bar does not exist and is not in index after "git rm -f bar"' \
- '! [ -f bar ] && test_must_fail git ls-files --error-unmatch bar'
-+ 'test_path_is_missing bar && test_must_fail git ls-files --error-unmatch bar'
++ 'Post-check that bar does not exist and is not in index after "git rm -f bar"' '
++ test_path_is_missing bar &&
++ test_must_fail git ls-files --error-unmatch bar
++'
test_expect_success \
'Test that "git rm -- -q" succeeds (remove a file that looks like an option)' \
--
gitgitgadget
next prev parent reply other threads:[~2019-02-28 10:26 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 13:42 [PATCH 0/1] [GSoC][PATCH] tests: replace test -(d|f) with test_path_is_(dir|file) Rohit Ashiwal via GitGitGadget
2019-02-26 13:42 ` [PATCH 1/1] tests: replace `test -(d|f)` " Rohit Ashiwal via GitGitGadget
2019-02-26 14:04 ` Duy Nguyen
2019-02-26 16:10 ` Do test-path_is_{file,dir,exists} make sense anymore with -x? Ævar Arnfjörð Bjarmason
2019-02-26 17:04 ` SZEDER Gábor
2019-02-26 17:43 ` Jeff King
2019-02-26 19:39 ` SZEDER Gábor
2019-02-26 21:01 ` Jeff King
2019-03-03 16:04 ` SZEDER Gábor
2019-03-05 4:55 ` Jeff King
2019-03-04 14:36 ` SZEDER Gábor
2019-03-05 4:58 ` Jeff King
2019-02-26 17:48 ` Matthieu Moy
2019-02-26 18:24 ` Jeff King
2019-02-26 17:35 ` Jeff King
2019-02-26 19:58 ` Johannes Schindelin
2019-02-26 21:02 ` Jeff King
2019-02-27 10:01 ` Duy Nguyen
2019-03-01 2:52 ` Junio C Hamano
2019-02-26 16:01 ` [PATCH 1/1] tests: replace `test -(d|f)` with test_path_is_(dir|file) Johannes Schindelin
2019-02-26 16:30 ` Martin Ågren
2019-02-26 18:29 ` Rohit Ashiwal
2019-02-26 19:52 ` Johannes Schindelin
2019-02-26 20:01 ` Rohit Ashiwal
2019-02-27 5:49 ` Martin Ågren
2019-02-26 14:26 ` [PATCH v2 0/1] [GSoC][PATCH] t3600: use test_path_is_dir and test_path_is_file Rohit Ashiwal via GitGitGadget
2019-02-26 14:26 ` [PATCH v2 1/1] " Rohit Ashiwal via GitGitGadget
2019-02-26 16:37 ` SZEDER Gábor
2019-02-26 18:40 ` Rohit Ashiwal
2019-02-26 20:02 ` Johannes Schindelin
2019-02-26 20:05 ` Rohit Ashiwal
2019-02-26 22:48 ` [PATCH v3 0/1] [GSoC][PATCH] t3600: use test_path_is_* helper functions Rohit Ashiwal via GitGitGadget
2019-02-26 22:48 ` [PATCH v3 1/1] t3600: use test_path_is_* functions Rohit Ashiwal via GitGitGadget
2019-02-27 10:12 ` Duy Nguyen
2019-02-28 10:26 ` Rohit Ashiwal via GitGitGadget [this message]
2019-02-28 10:26 ` [PATCH v4 " Rohit Ashiwal via GitGitGadget
2019-02-28 19:02 ` [GSoC] acknowledging mistakes Rohit Ashiwal
2019-03-01 2:51 ` Junio C Hamano
2019-03-01 13:13 ` Feeling confused a little bit Rohit Ashiwal
2019-03-02 4:24 ` Rafael Ascensão
2019-03-02 14:46 ` Thomas Gummerer
2019-03-02 16:21 ` [GSoC] Thanking Rohit Ashiwal
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=pull.152.v4.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--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.
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).