undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t1005: assert output of ls-files

Browse Source 
Test 'reset should work' in t1005-read-tree-reset.sh compares two files
"expect" and "actual" to assert the expected output of "git ls-files".
Several other tests in the same file also create files "expect" and
"actual", but don't use them in assertions.

Assert output of "git ls-files" in t1005-read-tree-reset.sh to improve
test coverage.

Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andrei Rybak 2023-03-18 16:46:40 +01:00 committed by Junio C Hamano
parent 73876f4861
commit 8fc184c0eb
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
t/t1005-read-tree-reset.sh
View File

@ -41,7 +41,8 @@ test_expect_success 'reset should remove remnants from a failed merge' '
git ls-files -s && git ls-files -s &&
read_tree_u_must_succeed --reset -u HEAD && read_tree_u_must_succeed --reset -u HEAD &&
git ls-files -s >actual && git ls-files -s >actual &&
! test -f old ! test -f old &&
test_cmp expect actual
' '
test_expect_success 'two-way reset should remove remnants too' ' test_expect_success 'two-way reset should remove remnants too' '
@ -56,7 +57,8 @@ test_expect_success 'two-way reset should remove remnants too' '
git ls-files -s && git ls-files -s &&
read_tree_u_must_succeed --reset -u HEAD HEAD && read_tree_u_must_succeed --reset -u HEAD HEAD &&
git ls-files -s >actual && git ls-files -s >actual &&
! test -f old ! test -f old &&
test_cmp expect actual
' '
test_expect_success 'Porcelain reset should remove remnants too' ' test_expect_success 'Porcelain reset should remove remnants too' '
@ -71,7 +73,8 @@ test_expect_success 'Porcelain reset should remove remnants too' '
git ls-files -s && git ls-files -s &&
git reset --hard && git reset --hard &&
git ls-files -s >actual && git ls-files -s >actual &&
! test -f old ! test -f old &&
test_cmp expect actual
' '
test_expect_success 'Porcelain checkout -f should remove remnants too' ' test_expect_success 'Porcelain checkout -f should remove remnants too' '
@ -86,7 +89,8 @@ test_expect_success 'Porcelain checkout -f should remove remnants too' '
git ls-files -s && git ls-files -s &&
git checkout -f && git checkout -f &&
git ls-files -s >actual && git ls-files -s >actual &&
! test -f old ! test -f old &&
test_cmp expect actual
' '
test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' ' test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' '
@ -101,7 +105,8 @@ test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' '
git ls-files -s && git ls-files -s &&
git checkout -f HEAD && git checkout -f HEAD &&
git ls-files -s >actual && git ls-files -s >actual &&
! test -f old ! test -f old &&
test_cmp expect actual
' '
test_done test_done