t5530: compute results based on object length
Compute the various pkt-line values based on the length of the object IDs in use. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Dec 21, 2019 at 19:49 UTC
832072219cf9f2607ac1a509510fc65cd2fe0e06
1 file changed
+14
-12
t/t5530-upload-pack-error.sh
+14
-12
@@ -14,7 +14,7 @@ corrupt_repo () {
14
}
15
16
test_expect_success 'setup and corrupt repository' '
17
-
17
+ test_oid_init &&
18
echo file >file &&
19
git add file &&
20
git rev-parse :file &&
@@ -31,9 +31,10 @@ test_expect_success 'fsck fails' '
31
'
32
33
test_expect_success 'upload-pack fails due to error in pack-objects packing' '
34
-
35
- printf "0032want %s\n00000009done\n0000" \
36
- $(git rev-parse HEAD) >input &&
34
+ head=$(git rev-parse HEAD) &&
35
+ hexsz=$(test_oid hexsz) &&
36
+ printf "%04xwant %s\n00000009done\n0000" \
37
+ $(($hexsz + 10)) $head >input &&
38
test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
39
test_i18ngrep "unable to read" output.err &&
40
test_i18ngrep "pack-objects died" output.err
@@ -51,16 +52,17 @@ test_expect_success 'fsck fails' '
52
'
53
test_expect_success 'upload-pack fails due to error in rev-list' '
54
54
- printf "0032want %s\n0034shallow %s00000009done\n0000" \
55
- $(git rev-parse HEAD) $(git rev-parse HEAD^) >input &&
55
+ printf "%04xwant %s\n%04xshallow %s00000009done\n0000" \
56
+ $(($hexsz + 10)) $(git rev-parse HEAD) \
57
+ $(($hexsz + 12)) $(git rev-parse HEAD^) >input &&
58
test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
59
grep "bad tree object" output.err
60
'
61
62
test_expect_success 'upload-pack fails due to bad want (no object)' '
63
62
- printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
63
- "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >input &&
64
+ printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
65
+ $(($hexsz + 29)) $(test_oid deadbeef) >input &&
66
test_must_fail git upload-pack . <input >output 2>output.err &&
67
grep "not our ref" output.err &&
68
grep "ERR" output &&
@@ -70,8 +72,8 @@ test_expect_success 'upload-pack fails due to bad want (no object)' '
72
test_expect_success 'upload-pack fails due to bad want (not tip)' '
73
74
oid=$(echo an object we have | git hash-object -w --stdin) &&
73
- printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
74
- "$oid" >input &&
75
+ printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
76
+ $(($hexsz + 29)) "$oid" >input &&
77
test_must_fail git upload-pack . <input >output 2>output.err &&
78
grep "not our ref" output.err &&
79
grep "ERR" output &&
@@ -80,8 +82,8 @@ test_expect_success 'upload-pack fails due to bad want (not tip)' '
82
83
test_expect_success 'upload-pack fails due to error in pack-objects enumeration' '
84
83
- printf "0032want %s\n00000009done\n0000" \
84
- $(git rev-parse HEAD) >input &&
85
+ printf "%04xwant %s\n00000009done\n0000" \
86
+ $((hexsz + 10)) $(git rev-parse HEAD) >input &&
87
test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
88
grep "bad tree object" output.err &&
89
grep "pack-objects died" output.err