Modernize t5530-upload-pack-error.
Some tests did not use test_must_fail. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt committed
Mar 6, 2010 at 16:40 UTC
1d8cd418b49f08146d6d47cf8881965f922686cb
1 file changed
+9
-9
t/t5530-upload-pack-error.sh
+9
-9
@@ -32,9 +32,9 @@ test_expect_success 'fsck fails' '
32
33
test_expect_success 'upload-pack fails due to error in pack-objects packing' '
34
35
- ! echo "0032want $(git rev-parse HEAD)
36
-00000009done
37
-0000" | git upload-pack . > /dev/null 2> output.err &&
35
+ printf "0032want %s\n00000009done\n0000" \
36
+ $(git rev-parse HEAD) >input &&
37
+ test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
38
grep "unable to read" output.err &&
39
grep "pack-objects died" output.err
40
'
@@ -51,9 +51,9 @@ test_expect_success 'fsck fails' '
51
'
52
test_expect_success 'upload-pack fails due to error in rev-list' '
53
54
- ! echo "0032want $(git rev-parse HEAD)
55
-0034shallow $(git rev-parse HEAD^)00000009done
56
-0000" | git upload-pack . > /dev/null 2> output.err &&
54
+ printf "0032want %s\n0034shallow %s00000009done\n0000" \
55
+ $(git rev-parse HEAD) $(git rev-parse HEAD^) >input &&
56
+ test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
57
# pack-objects survived
58
grep "Total.*, reused" output.err &&
59
# but there was an error, which must have been in rev-list
@@ -62,9 +62,9 @@ test_expect_success 'upload-pack fails due to error in rev-list' '
62
63
test_expect_success 'upload-pack fails due to error in pack-objects enumeration' '
64
65
- ! echo "0032want $(git rev-parse HEAD)
66
-00000009done
67
-0000" | git upload-pack . > /dev/null 2> output.err &&
65
+ printf "0032want %s\n00000009done\n0000" \
66
+ $(git rev-parse HEAD) >input &&
67
+ test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
68
grep "bad tree object" output.err &&
69
grep "pack-objects died" output.err
70
'