improve index-pack tests
Commit 9441b61dc5 introduced serious bugs in index-pack which are described and fixed by commit ce3f6dc655. However, despite the boldness of those bugs, the test suite still passed. This improves t5302-pack-index.sh so to ensure a much better code path coverage. With commit ce3f6dc655 reverted, 17 of the 26 tests do fail now. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Pitre committed
Oct 22, 2008 at 20:59 UTC
2b5c208f5bd371ea5527046384f9955dbbceb188
1 file changed
+65
-27
t/t5302-pack-index.sh
+65
-27
@@ -11,13 +11,18 @@ test_expect_success \
11
'rm -rf .git
12
git init &&
13
i=1 &&
14
- while test $i -le 100
14
+ while test $i -le 100
15
do
16
- i=`printf '%03i' $i`
17
- echo $i >file_$i &&
18
- test-genrandom "$i" 8192 >>file_$i &&
19
- git update-index --add file_$i &&
20
- i=`expr $i + 1` || return 1
16
+ iii=`printf '%03i' $i`
17
+ test-genrandom "bar" 200 > wide_delta_$iii &&
18
+ test-genrandom "baz $iii" 50 >> wide_delta_$iii &&
19
+ test-genrandom "foo"$i 100 > deep_delta_$iii &&
20
+ test-genrandom "foo"`expr $i + 1` 100 >> deep_delta_$iii &&
21
+ test-genrandom "foo"`expr $i + 2` 100 >> deep_delta_$iii &&
22
+ echo $iii >file_$iii &&
23
+ test-genrandom "$iii" 8192 >>file_$iii &&
24
+ git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
25
+ i=`expr $i + 1` || return 1
26
done &&
27
{ echo 101 && test-genrandom 100 8192; } >file_101 &&
28
git update-index --add file_101 &&
@@ -92,6 +97,31 @@ test_expect_success \
97
'64-bit offsets: index-pack result should match pack-objects one' \
98
'cmp "test-3-${pack3}.idx" "3.idx"'
99
100
+# returns the object number for given object in given pack index
101
+index_obj_nr()
102
+{
103
+ idx_file=$1
104
+ object_sha1=$2
105
+ nr=0
106
+ git show-index < $idx_file |
107
+ while read offs sha1 extra
108
+ do
109
+ nr=$(($nr + 1))
110
+ test "$sha1" = "$object_sha1" || continue
111
+ echo "$(($nr - 1))"
112
+ break
113
+ done
114
+}
115
+
116
+# returns the pack offset for given object as found in given pack index
117
+index_obj_offset()
118
+{
119
+ idx_file=$1
120
+ object_sha1=$2
121
+ git show-index < $idx_file | grep $object_sha1 |
122
+ ( read offs extra && echo "$offs" )
123
+}
124
+
125
test_expect_success \
126
'[index v1] 1) stream pack to repository' \
127
'git index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" &&
@@ -102,19 +132,22 @@ test_expect_success \
132
133
test_expect_success \
134
'[index v1] 2) create a stealth corruption in a delta base reference' \
105
- '# this test assumes a delta smaller than 16 bytes at the end of the pack
106
- git show-index <1.idx | sort -n | sed -ne \$p | (
107
- read delta_offs delta_sha1 &&
108
- git cat-file blob "$delta_sha1" > blob_1 &&
109
- chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
110
- dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($delta_offs + 1)) \
111
- if=".git/objects/pack/pack-${pack1}.idx" skip=$((256 * 4 + 4)) \
112
- bs=1 count=20 conv=notrunc &&
113
- git cat-file blob "$delta_sha1" > blob_2 )'
135
+ '# This test assumes file_101 is a delta smaller than 16 bytes.
136
+ # It should be against file_100 but we substitute its base for file_099
137
+ sha1_101=`git hash-object file_101` &&
138
+ sha1_099=`git hash-object file_099` &&
139
+ offs_101=`index_obj_offset 1.idx $sha1_101` &&
140
+ nr_099=`index_obj_nr 1.idx $sha1_099` &&
141
+ chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
142
+ dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
143
+ if=".git/objects/pack/pack-${pack1}.idx" \
144
+ skip=$((4 + 256 * 4 + $nr_099 * 24)) \
145
+ bs=1 count=20 conv=notrunc &&
146
+ git cat-file blob $sha1_101 > file_101_foo1'
147
148
test_expect_success \
149
'[index v1] 3) corrupted delta happily returned wrong data' \
117
- '! cmp blob_1 blob_2'
150
+ 'test -f file_101_foo1 && ! cmp file_101 file_101_foo1'
151
152
test_expect_success \
153
'[index v1] 4) confirm that the pack is actually corrupted' \
@@ -140,19 +173,22 @@ test_expect_success \
173
174
test_expect_success \
175
'[index v2] 2) create a stealth corruption in a delta base reference' \
143
- '# this test assumes a delta smaller than 16 bytes at the end of the pack
144
- git show-index <1.idx | sort -n | sed -ne \$p | (
145
- read delta_offs delta_sha1 delta_crc &&
146
- git cat-file blob "$delta_sha1" > blob_3 &&
147
- chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
148
- dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($delta_offs + 1)) \
149
- if=".git/objects/pack/pack-${pack1}.idx" skip=$((8 + 256 * 4)) \
150
- bs=1 count=20 conv=notrunc &&
151
- git cat-file blob "$delta_sha1" > blob_4 )'
176
+ '# This test assumes file_101 is a delta smaller than 16 bytes.
177
+ # It should be against file_100 but we substitute its base for file_099
178
+ sha1_101=`git hash-object file_101` &&
179
+ sha1_099=`git hash-object file_099` &&
180
+ offs_101=`index_obj_offset 1.idx $sha1_101` &&
181
+ nr_099=`index_obj_nr 1.idx $sha1_099` &&
182
+ chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
183
+ dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
184
+ if=".git/objects/pack/pack-${pack1}.idx" \
185
+ skip=$((8 + 256 * 4 + $nr_099 * 20)) \
186
+ bs=1 count=20 conv=notrunc &&
187
+ git cat-file blob $sha1_101 > file_101_foo2'
188
189
test_expect_success \
190
'[index v2] 3) corrupted delta happily returned wrong data' \
155
- '! cmp blob_3 blob_4'
191
+ 'test -f file_101_foo2 && ! cmp file_101 file_101_foo2'
192
193
test_expect_success \
194
'[index v2] 4) confirm that the pack is actually corrupted' \
@@ -167,9 +203,11 @@ test_expect_success \
203
'rm -f .git/objects/pack/* &&
204
git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
205
git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
206
+ obj=`git hash-object file_001` &&
207
+ nr=`index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj` &&
208
chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
209
dd if=/dev/zero of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
172
- bs=1 count=4 seek=$((8 + 256 * 4 + `wc -l <obj-list` * 20 + 0)) &&
210
+ bs=1 count=4 seek=$((8 + 256 * 4 + `wc -l <obj-list` * 20 + $nr * 4)) &&
211
( while read obj
212
do git cat-file -p $obj >/dev/null || exit 1
213
done <obj-list ) &&