[PATCH v4 0/1] [GSoC][PATCH] t3600: use test_path_is_* helper functions
- From
Rohit Ashiwal via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Feb 28, 2019, 10:26 UTC
- Message-ID
- <pull.152.v4.git.gitgitgadget@gmail.com>
- 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