t7408: replace incorrect uses of test_must_fail
According to t/README, test_must_fail() should only be used to test for failure in Git commands. Replace the invocation of `test_must_fail test_path_is_file` with `test_path_is_missing` since, in this test case, the path should not exist at all. In all the cases where `test_must_fail test_alternate_is_used` appears, test_alternate_is_used() fails because test_line_count() cannot open the non-existent $alternates_file. Replace `test_must_fail test_alternate_is_used` with `test_path_is_missing` to test for this directly. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Apr 20, 2020 at 04:54 UTC
4cf795b842f37b56fae09c3412f3c59c370c392d
1 file changed
+4
-4
t/t7408-submodule-reference.sh
+4
-4
@@ -122,8 +122,8 @@ test_expect_success 'missing submodule alternate fails clone and submodule updat
122
# update of the submodule succeeds
123
test_must_fail git submodule update --init &&
124
# and we have no alternates:
125
- test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub &&
126
- test_must_fail test_path_is_file sub/file1
125
+ test_path_is_missing .git/modules/sub/objects/info/alternates &&
126
+ test_path_is_missing sub/file1
127
)
128
'
129
@@ -137,7 +137,7 @@ test_expect_success 'ignoring missing submodule alternates passes clone and subm
137
# update of the submodule succeeds
138
git submodule update --init &&
139
# and we have no alternates:
140
- test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub &&
140
+ test_path_is_missing .git/modules/sub/objects/info/alternates &&
141
test_path_is_file sub/file1
142
)
143
'
@@ -182,7 +182,7 @@ check_that_two_of_three_alternates_are_used() {
182
# immediate submodule has alternate:
183
test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
184
# but nested submodule has no alternate:
185
- test_must_fail test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
185
+ test_path_is_missing .git/modules/subwithsub/modules/sub/objects/info/alternates
186
}
187
188