t5530: modernize tests

Refactor tests to follow modern best practices:

  - Merge together tests that set up and verify a single use case.

  - Drop empty newlines at the beginning and end of test bodies.

  - Don't change directories in the main test body.

  - Remove an unused `D` variable.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh
index 558eedf25a4c9b9f2bac8dca0d69b1b7eaebf381..8e505786f1b76bc3d4d3a7c27207ac7f6eb8244a 100755 (executable)
--- a/t/t5530-upload-pack-error.sh
+++ b/t/t5530-upload-pack-error.sh
@@ -4,8 +4,6 @@ test_description='errors in upload-pack'
 
 . ./test-lib.sh
 
-D=$(pwd)
-
 corrupt_repo () {
        object_sha1=$(git rev-parse "$1") &&
        ob=$(expr "$object_sha1" : "\(..\)") &&
@@ -21,11 +19,7 @@ test_expect_success 'setup and corrupt repository' '
        test_tick &&
        echo changed >file &&
        git commit -a -m changed &&
-       corrupt_repo HEAD:file
-
-'
-
-test_expect_success 'fsck fails' '
+       corrupt_repo HEAD:file &&
        test_must_fail git fsck
 '
 
@@ -40,17 +34,12 @@ test_expect_success 'upload-pack fails due to error in pack-objects packing' '
 '
 
 test_expect_success 'corrupt repo differently' '
-
        git hash-object -w file &&
-       corrupt_repo HEAD^^{tree}
-
-'
-
-test_expect_success 'fsck fails' '
+       corrupt_repo HEAD^^{tree} &&
        test_must_fail git fsck
 '
-test_expect_success 'upload-pack fails due to error in rev-list' '
 
+test_expect_success 'upload-pack fails due to error in rev-list' '
        printf "%04xwant %s\n%04xshallow %s00000009done\n0000" \
                $(($hexsz + 10)) $(git rev-parse HEAD) \
                $(($hexsz + 12)) $(git rev-parse HEAD^) >input &&
@@ -59,7 +48,6 @@ test_expect_success 'upload-pack fails due to error in rev-list' '
 '
 
 test_expect_success 'upload-pack fails due to bad want (no object)' '
-
        printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
                $(($hexsz + 29)) $(test_oid deadbeef) >input &&
        test_must_fail git upload-pack . <input >output 2>output.err &&
@@ -69,7 +57,6 @@ test_expect_success 'upload-pack fails due to bad want (no object)' '
 '
 
 test_expect_success 'upload-pack fails due to bad want (not tip)' '
-
        oid=$(echo an object we have | git hash-object -w --stdin) &&
        printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
                $(($hexsz + 29)) "$oid" >input &&
@@ -80,7 +67,6 @@ test_expect_success 'upload-pack fails due to bad want (not tip)' '
 '
 
 test_expect_success 'upload-pack fails due to error in pack-objects enumeration' '
-
        printf "%04xwant %s\n00000009done\n0000" \
                $((hexsz + 10)) $(git rev-parse HEAD) >input &&
        test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
@@ -105,18 +91,9 @@ test_expect_success 'upload-pack tolerates EOF just after stateless client wants
        test_cmp expect actual
 '
 
-test_expect_success 'create empty repository' '
-
-       mkdir foo &&
-       cd foo &&
-       git init
-
-'
-
 test_expect_success 'fetch fails' '
-
-       test_must_fail git fetch .. main
-
+       git init foo &&
+       test_must_fail git -C foo fetch .. main
 '
 
 test_done