diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:50 -0700 |
| commit | 81bfe5434aaae0cf8586bdfbe318a9a779b03fc5 (patch) | |
| tree | e7f12d6ad3890d3cbdf12a23c9faf2595c30edab /t/t7408-submodule-reference.sh | |
| parent | Merge branch 'jk/build-with-right-curl' (diff) | |
| parent | t9819: don't use test_must_fail with p4 (diff) | |
| download | tgif-81bfe5434aaae0cf8586bdfbe318a9a779b03fc5.tar.xz | |
Merge branch 'dl/test-must-fail-fixes-4'
Test clean-up.
* dl/test-must-fail-fixes-4:
t9819: don't use test_must_fail with p4
t9164: use test_must_fail only on git commands
t9160: use test_path_is_missing()
t9141: use test_path_is_missing()
t7508: don't use `test_must_fail test_cmp`
t7408: replace incorrect uses of test_must_fail
t6030: use test_path_is_missing()
Diffstat (limited to 't/t7408-submodule-reference.sh')
| -rwxr-xr-x | t/t7408-submodule-reference.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh index 34ac28c056..a3892f494b 100755 --- a/t/t7408-submodule-reference.sh +++ b/t/t7408-submodule-reference.sh @@ -122,8 +122,8 @@ test_expect_success 'missing submodule alternate fails clone and submodule updat # update of the submodule succeeds test_must_fail git submodule update --init && # and we have no alternates: - test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub && - test_must_fail test_path_is_file sub/file1 + test_path_is_missing .git/modules/sub/objects/info/alternates && + test_path_is_missing sub/file1 ) ' @@ -137,7 +137,7 @@ test_expect_success 'ignoring missing submodule alternates passes clone and subm # update of the submodule succeeds git submodule update --init && # and we have no alternates: - test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub && + test_path_is_missing .git/modules/sub/objects/info/alternates && test_path_is_file sub/file1 ) ' @@ -182,7 +182,7 @@ check_that_two_of_three_alternates_are_used() { # immediate submodule has alternate: test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub && # but nested submodule has no alternate: - test_must_fail test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub + test_path_is_missing .git/modules/subwithsub/modules/sub/objects/info/alternates } |