kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Elijah Newren 2020-02-27 00:14:21 +00:00 committed by Junio C Hamano
parent 42d180dd01
commit b821ca788b
3 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/t6020-merge-df.sh
View File

@ -83,9 +83,9 @@ test_expect_success 'modify/delete + directory/file conflict' '
test 4 -eq $(git ls-files -u | wc -l) && test 4 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) && test 1 -eq $(git ls-files -o | wc -l) &&


test -f letters/file && test_path_is_file letters/file &&
test -f letters.txt && test_path_is_file letters.txt &&
test -f letters~modify test_path_is_file letters~modify
' '


test_expect_success 'modify/delete + directory/file conflict; other way' ' 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 4 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) && test 1 -eq $(git ls-files -o | wc -l) &&


test -f letters/file && test_path_is_file letters/file &&
test -f letters.txt && test_path_is_file letters.txt &&
test -f letters~HEAD test_path_is_file letters~HEAD
' '


test_done test_done

54
t/t6022-merge-rename.sh
View File

@ -295,8 +295,8 @@ test_expect_success 'Rename+D/F conflict; renamed file merges + dir not in way'
git merge --strategy=recursive dir-not-in-way && git merge --strategy=recursive dir-not-in-way &&


git diff --quiet && git diff --quiet &&
test -f dir && test_path_is_file dir &&
printf "1\n2\n3\n4\n5555\n6\n7\n8\n9\n10\n11\n" >expected && test_write_lines 1 2 3 4 5555 6 7 8 9 10 11 >expected &&
test_cmp expected dir test_cmp expected dir
' '


@ -316,8 +316,8 @@ test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' '
test_must_fail git diff --quiet && test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet && test_must_fail git diff --cached --quiet &&


test -f dir/file-in-the-way && test_path_is_file dir/file-in-the-way &&
test -f dir~HEAD && test_path_is_file dir~HEAD &&
test_cmp expected dir~HEAD test_cmp expected dir~HEAD
' '


@ -338,8 +338,8 @@ test_expect_success 'Same as previous, but merged other way' '
test_must_fail git diff --quiet && test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet && test_must_fail git diff --cached --quiet &&


test -f dir/file-in-the-way && test_path_is_file dir/file-in-the-way &&
test -f dir~renamed-file-has-no-conflicts && test_path_is_file dir~renamed-file-has-no-conflicts &&
test_cmp expected dir~renamed-file-has-no-conflicts test_cmp expected dir~renamed-file-has-no-conflicts
' '


@ -355,7 +355,7 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in
test_must_fail git diff --quiet && test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet && test_must_fail git diff --cached --quiet &&


test -f dir && test_path_is_file dir &&
cat >expected <<-\EOF && cat >expected <<-\EOF &&
1 1
2 2
@ -391,8 +391,8 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge and dir in t
test_must_fail git diff --quiet && test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet && test_must_fail git diff --cached --quiet &&


test -f dir/file-in-the-way && test_path_is_file dir/file-in-the-way &&
test -f dir~HEAD && test_path_is_file dir~HEAD &&
test_cmp expected dir~HEAD test_cmp expected dir~HEAD
' '


@ -409,8 +409,8 @@ test_expect_success 'Same as previous, but merged other way' '
test_must_fail git diff --quiet && test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet && test_must_fail git diff --cached --quiet &&


test -f dir/file-in-the-way && test_path_is_file dir/file-in-the-way &&
test -f dir~renamed-file-has-conflicts && test_path_is_file dir~renamed-file-has-conflicts &&
cat >expected <<-\EOF && cat >expected <<-\EOF &&
1 1
2 2
@ -463,9 +463,9 @@ test_expect_success 'both rename source and destination involved in D/F conflict


test_must_fail git diff --quiet && test_must_fail git diff --quiet &&


test -f destdir/foo && test_path_is_file destdir/foo &&
test -f one && test_path_is_file one &&
test -f destdir~HEAD && test_path_is_file destdir~HEAD &&
test "stuff" = "$(cat destdir~HEAD)" test "stuff" = "$(cat destdir~HEAD)"
' '


@ -506,9 +506,9 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked


test 4 -eq $(find . | grep -v .git | wc -l) && test 4 -eq $(find . | grep -v .git | wc -l) &&


test -d one && test_path_is_dir one &&
test -f one~rename-two && test_path_is_file one~rename-two &&
test -f two && test_path_is_file two &&
test "other" = $(cat one~rename-two) && test "other" = $(cat one~rename-two) &&
test "stuff" = $(cat two) test "stuff" = $(cat two)
' '
@ -526,8 +526,8 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ clean sta


test 3 -eq $(find . | grep -v .git | wc -l) && test 3 -eq $(find . | grep -v .git | wc -l) &&


test -f one && test_path_is_file one &&
test -f two && test_path_is_file two &&
test "other" = $(cat one) && test "other" = $(cat one) &&
test "stuff" = $(cat two) test "stuff" = $(cat two)
' '
@ -567,11 +567,11 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
test 1 -eq "$(git ls-files -u original | wc -l)" && test 1 -eq "$(git ls-files -u original | wc -l)" &&
test 2 -eq "$(git ls-files -o | wc -l)" && test 2 -eq "$(git ls-files -o | wc -l)" &&


test -f one/file && test_path_is_file one/file &&
test -f two/file && test_path_is_file two/file &&
test -f one~HEAD && test_path_is_file one~HEAD &&
test -f two~second-rename && test_path_is_file two~second-rename &&
! test -f original test_path_is_missing original
' '


test_expect_success 'setup rename one file to two; directories moving out of the way' ' test_expect_success 'setup rename one file to two; directories moving out of the way' '
@ -606,9 +606,9 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
test 1 -eq "$(git ls-files -u original | wc -l)" && test 1 -eq "$(git ls-files -u original | wc -l)" &&
test 0 -eq "$(git ls-files -o | wc -l)" && test 0 -eq "$(git ls-files -o | wc -l)" &&


test -f one && test_path_is_file one &&
test -f two && test_path_is_file two &&
! test -f original test_path_is_missing original
' '


test_expect_success 'setup avoid unnecessary update, normal rename' ' test_expect_success 'setup avoid unnecessary update, normal rename' '

28
t/t6035-merge-dir-to-symlink.sh
View File

@ -31,19 +31,19 @@ test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
git rm --cached a/b && git rm --cached a/b &&
git commit -m "untracked symlink remains" && git commit -m "untracked symlink remains" &&
git checkout -f start^0 && git checkout -f start^0 &&
test -f a/b-2/c/d test_path_is_file a/b-2/c/d
' '


test_expect_success 'checkout should not have deleted a/b-2/c/d' ' test_expect_success 'checkout should not have deleted a/b-2/c/d' '
git checkout HEAD^0 && git checkout HEAD^0 &&
git reset --hard master && git reset --hard master &&
git checkout start^0 && git checkout start^0 &&
test -f a/b-2/c/d test_path_is_file a/b-2/c/d
' '


test_expect_success 'setup for merge test' ' test_expect_success 'setup for merge test' '
git reset --hard && git reset --hard &&
test -f a/b-2/c/d && test_path_is_file a/b-2/c/d &&
echo x > a/x && echo x > a/x &&
git add a/x && git add a/x &&
git commit -m x && git commit -m x &&
@ -54,7 +54,7 @@ test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolv
git reset --hard && git reset --hard &&
git checkout baseline^0 && git checkout baseline^0 &&
git merge -s resolve master && git merge -s resolve master &&
test -f a/b-2/c/d test_path_is_file a/b-2/c/d
' '


test_expect_success SYMLINKS 'a/b was resolved as symlink' ' test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@ -65,7 +65,7 @@ test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recurs
git reset --hard && git reset --hard &&
git checkout baseline^0 && git checkout baseline^0 &&
git merge -s recursive master && git merge -s recursive master &&
test -f a/b-2/c/d test_path_is_file a/b-2/c/d
' '


test_expect_success SYMLINKS 'a/b was resolved as symlink' ' test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@ -76,7 +76,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolv
git reset --hard && git reset --hard &&
git checkout master^0 && git checkout master^0 &&
git merge -s resolve baseline^0 && git merge -s resolve baseline^0 &&
test -f a/b-2/c/d test_path_is_file a/b-2/c/d
' '


test_expect_success SYMLINKS 'a/b was resolved as symlink' ' test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@ -87,7 +87,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recurs
git reset --hard && git reset --hard &&
git checkout master^0 && git checkout master^0 &&
git merge -s recursive baseline^0 && git merge -s recursive baseline^0 &&
test -f a/b-2/c/d test_path_is_file a/b-2/c/d
' '


test_expect_success SYMLINKS 'a/b was resolved as symlink' ' test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@ -99,8 +99,8 @@ test_expect_failure 'do not lose untracked in merge (resolve)' '
git checkout baseline^0 && git checkout baseline^0 &&
>a/b/c/e && >a/b/c/e &&
test_must_fail git merge -s resolve master && test_must_fail git merge -s resolve master &&
test -f a/b/c/e && test_path_is_file a/b/c/e &&
test -f a/b-2/c/d test_path_is_file a/b-2/c/d
' '


test_expect_success 'do not lose untracked in merge (recursive)' ' test_expect_success 'do not lose untracked in merge (recursive)' '
@ -108,8 +108,8 @@ test_expect_success 'do not lose untracked in merge (recursive)' '
git checkout baseline^0 && git checkout baseline^0 &&
>a/b/c/e && >a/b/c/e &&
test_must_fail git merge -s recursive master && test_must_fail git merge -s recursive master &&
test -f a/b/c/e && test_path_is_file a/b/c/e &&
test -f a/b-2/c/d test_path_is_file a/b-2/c/d
' '


test_expect_success 'do not lose modifications in merge (resolve)' ' test_expect_success 'do not lose modifications in merge (resolve)' '
@ -140,7 +140,7 @@ test_expect_success 'merge should not have D/F conflicts (resolve)' '
git reset --hard && git reset --hard &&
git checkout baseline^0 && git checkout baseline^0 &&
git merge -s resolve test2 && git merge -s resolve test2 &&
test -f a/b/c/d test_path_is_file a/b/c/d
' '


test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' ' test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
@ -151,7 +151,7 @@ test_expect_success 'merge should not have D/F conflicts (recursive)' '
git reset --hard && git reset --hard &&
git checkout baseline^0 && git checkout baseline^0 &&
git merge -s recursive test2 && git merge -s recursive test2 &&
test -f a/b/c/d test_path_is_file a/b/c/d
' '


test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' ' test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
@ -162,7 +162,7 @@ test_expect_success 'merge should not have F/D conflicts (recursive)' '
git reset --hard && git reset --hard &&
git checkout -b foo test2 && git checkout -b foo test2 &&
git merge -s recursive baseline^0 && git merge -s recursive baseline^0 &&
test -f a/b/c/d test_path_is_file a/b/c/d
' '


test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' ' test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '