diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-02-27 00:14:21 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-27 11:01:48 -0800 |
| commit | b821ca788bee258fb2364722dafe0b60a3219863 (patch) | |
| tree | 6633449c0fadcde16d2263c2f4168d89602f34b5 /t/t6020-merge-df.sh | |
| parent | t602[1236], t6034: modernize test formatting (diff) | |
| download | tgif-b821ca788bee258fb2364722dafe0b60a3219863.tar.xz | |
t6020, t6022, t6035: update merge tests to use test helper functions
Make use of test_path_is_file, test_write_lines, and similar helpers
in these old test files.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6020-merge-df.sh')
| -rwxr-xr-x | t/t6020-merge-df.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh index 46b506b3b7..cf662068da 100755 --- a/t/t6020-merge-df.sh +++ b/t/t6020-merge-df.sh @@ -83,9 +83,9 @@ test_expect_success 'modify/delete + directory/file conflict' ' test 4 -eq $(git ls-files -u | wc -l) && test 1 -eq $(git ls-files -o | wc -l) && - test -f letters/file && - test -f letters.txt && - test -f letters~modify + test_path_is_file letters/file && + test_path_is_file letters.txt && + test_path_is_file letters~modify ' test_expect_success 'modify/delete + directory/file conflict; other way' ' @@ -99,9 +99,9 @@ test_expect_success 'modify/delete + directory/file conflict; other way' ' test 4 -eq $(git ls-files -u | wc -l) && test 1 -eq $(git ls-files -o | wc -l) && - test -f letters/file && - test -f letters.txt && - test -f letters~HEAD + test_path_is_file letters/file && + test_path_is_file letters.txt && + test_path_is_file letters~HEAD ' test_done |