test: do not negate test_path_is_* to assert absense
These tests use "! test_path_is_dir" or "! test_path_is_file" to ensure that the path is not recursively checked out or "submodule update" did not touch the working tree. Use "test_path_is_missing" to assert that the path does not exist, instead of negating test_path_is_* helpers; they are designed to be loud in wrong occasions. Besides, negating "test_path_is_dir" would mean we would be happy if a file exists there, which is not the case for these tests. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 15, 2023 at 19:26 UTC
b126b65b3381cd8659552b39699b3b3d9a4f5393
2 files changed
+3
-3
t/lib-submodule-update.sh
+1
-1
@@ -802,7 +802,7 @@ test_submodule_recursing_with_args_common () {
802
git branch -t no_submodule origin/no_submodule &&
803
$command no_submodule &&
804
test_superproject_content origin/no_submodule &&
805
- ! test_path_is_dir sub1 &&
805
+ test_path_is_missing sub1 &&
806
test_must_fail git config -f .git/modules/sub1/config core.worktree &&
807
test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
808
)
t/t5572-pull-submodule.sh
+2
-2
@@ -121,7 +121,7 @@ test_expect_success "fetch.recurseSubmodules option triggers recursive fetch (bu
121
sub_oid=$(git -C child rev-parse HEAD) &&
122
git -C super/sub cat-file -e $sub_oid &&
123
# Check that the submodule worktree did not update
124
- ! test_path_is_file super/sub/merge_strategy_5.t
124
+ test_path_is_missing super/sub/merge_strategy_5.t
125
'
126
127
test_expect_success "fetch.recurseSubmodules takes precedence over submodule.recurse" '
@@ -134,7 +134,7 @@ test_expect_success "fetch.recurseSubmodules takes precedence over submodule.rec
134
sub_oid=$(git -C child rev-parse HEAD) &&
135
git -C super/sub cat-file -e $sub_oid &&
136
# Check that the submodule worktree did not update
137
- ! test_path_is_file super/sub/merge_strategy_6.t
137
+ test_path_is_missing super/sub/merge_strategy_6.t
138
'
139
140
test_expect_success 'pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)' '