t1005: assert output of ls-files
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>
Andrei Rybak committed
Mar 18, 2023 at 16:46 UTC
8fc184c0eb8de0bbcd5ad9c36326fa3856560fc4
1 file changed
+10
-5
t/t1005-read-tree-reset.sh
+10
-5
@@ -41,7 +41,8 @@ test_expect_success 'reset should remove remnants from a failed merge' '
41
git ls-files -s &&
42
read_tree_u_must_succeed --reset -u HEAD &&
43
git ls-files -s >actual &&
44
- ! test -f old
44
+ ! test -f old &&
45
+ test_cmp expect actual
46
'
47
48
test_expect_success 'two-way reset should remove remnants too' '
@@ -56,7 +57,8 @@ test_expect_success 'two-way reset should remove remnants too' '
57
git ls-files -s &&
58
read_tree_u_must_succeed --reset -u HEAD HEAD &&
59
git ls-files -s >actual &&
59
- ! test -f old
60
+ ! test -f old &&
61
+ test_cmp expect actual
62
'
63
64
test_expect_success 'Porcelain reset should remove remnants too' '
@@ -71,7 +73,8 @@ test_expect_success 'Porcelain reset should remove remnants too' '
73
git ls-files -s &&
74
git reset --hard &&
75
git ls-files -s >actual &&
74
- ! test -f old
76
+ ! test -f old &&
77
+ test_cmp expect actual
78
'
79
80
test_expect_success 'Porcelain checkout -f should remove remnants too' '
@@ -86,7 +89,8 @@ test_expect_success 'Porcelain checkout -f should remove remnants too' '
89
git ls-files -s &&
90
git checkout -f &&
91
git ls-files -s >actual &&
89
- ! test -f old
92
+ ! test -f old &&
93
+ test_cmp expect actual
94
'
95
96
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' '
105
git ls-files -s &&
106
git checkout -f HEAD &&
107
git ls-files -s >actual &&
104
- ! test -f old
108
+ ! test -f old &&
109
+ test_cmp expect actual
110
'
111
112
test_done