Test cleanup.

diff --git a/tests/t2000-server-pre-receive-ticket.sh b/tests/t2000-server-pre-receive-ticket.sh
index a1587298440aa2aa34e31a3a88854c1932303591..f0a7016f6678aafe1579245876465e03fd446aa7 100644 (file)
--- a/tests/t2000-server-pre-receive-ticket.sh
+++ b/tests/t2000-server-pre-receive-ticket.sh
@@ -22,8 +22,8 @@ install_server_hook 'pre-receive-ticket' 'pre-receive'
 test_expect_success 'reject with bad message' '
        echo $test_name >a &&
        git commit -a -m "$test_name" &&
-       head=$(git rev-parse HEAD)
-       git push >push.out 2>push.err
+       head=$(git rev-parse HEAD) &&
+       ! git push >push.out 2>push.err &&
        cat push.err | grep "Commit $head does not reference a ticket"
 '
 
@@ -49,24 +49,25 @@ test_expect_success 'reject with bad message in second of three' '
        # the bad one
        echo "$test_name second" >a &&
        git commit -a -m "$test_name second" &&
-       head=$(git rev-parse HEAD)
+       head=$(git rev-parse HEAD) &&
+       echo "head=$head" &&
 
        echo "$test_name third" >a &&
        git commit -a -m "$test_name third re #3222" &&
 
-       git push
+       ! git push >push.out 2>push.err &&
        cat push.err | grep "Commit $head does not reference a ticket"
 '
 
 test_expect_success 'accept with re in all of three' '
-       git reset --hard HEAD^^^
+       git reset --hard HEAD^^^ &&
        echo "$test_name first" >a &&
        git commit -a -m "$test_name first re #3222" &&
 
        # the bad one
        echo "$test_name second" >a &&
        git commit -a -m "$test_name second re #3222" &&
-       head=$(git rev-parse HEAD)
+       head=$(git rev-parse HEAD) &&
 
        echo "$test_name third" >a &&
        git commit -a -m "$test_name third re #3222" &&

diff --git a/tests/t2001-server-pre-receive-ticket-via-shim.sh b/tests/t2001-server-pre-receive-ticket-via-shim.sh
index 6a99ba665a2064413aa75dff10d0c9a143c8359f..fe82a711ac9b5abc33185f5e7587f95c11a9f928 100644 (file)
--- a/tests/t2001-server-pre-receive-ticket-via-shim.sh
+++ b/tests/t2001-server-pre-receive-ticket-via-shim.sh
@@ -23,8 +23,8 @@ install_server_hook 'pre-receive-ticket' 'pre-receive-ticket'
 test_expect_success 'reject with bad message via shim' '
        echo $test_name >a &&
        git commit -a -m "$test_name" &&
-       head=$(git rev-parse HEAD)
-       git push >push.out 2>push.err
+       head=$(git rev-parse HEAD) &&
+       ! git push >push.out 2>push.err &&
        cat push.err | grep "Commit $head does not reference a ticket"
 '
 

diff --git a/tests/t2002-server-pre-receive-ticket-branches.sh b/tests/t2002-server-pre-receive-ticket-branches.sh
index b57262586641f2f712a87d630cb24ec2b1d42c72..3f35809dd1a68e76dfc001ecfb199d183d583603 100644 (file)
--- a/tests/t2002-server-pre-receive-ticket-branches.sh
+++ b/tests/t2002-server-pre-receive-ticket-branches.sh
@@ -20,48 +20,48 @@ test_expect_success 'setup' '
 install_server_hook 'pre-receive-ticket' 'pre-receive'
 
 test_expect_success 'reject new branch with bad message' '
-       git checkout -b topic1 master
+       git checkout -b topic1 master &&
        echo $test_name >a &&
        git commit -a -m "$test_name" &&
        head=$(git rev-parse HEAD)
-       git push origin topic1 >push.out 2>push.err
+       ! git push origin topic1 >push.out 2>push.err &&
        cat push.err | grep "Commit $head does not reference a ticket"
 '
 
 # the last test has a dirty commit message, so ammend it with a good message
 test_expect_success 'accept new branch with re' '
-       git checkout -b topic2 master
+       git checkout -b topic2 master &&
        echo $test_name >a &&
        git commit --amend -m "$test_name re #3222" &&
        git push origin topic2
 '
 
 test_expect_success 'reject new branch with bad message in second of three' '
-       git checkout -b topic3 master
+       git checkout -b topic3 master &&
        echo "$test_name first" >a &&
        git commit -a -m "$test_name first re #3222" &&
 
        # the bad one
        echo "$test_name second" >a &&
        git commit -a -m "$test_name second" &&
-       head=$(git rev-parse HEAD)
+       head=$(git rev-parse HEAD) &&
 
        echo "$test_name third" >a &&
        git commit -a -m "$test_name third re #3222" &&
 
-       git push origin topic3 >push.out 2>push.err
+       ! git push origin topic3 >push.out 2>push.err &&
        cat push.err | grep "Commit $head does not reference a ticket"
 '
 
 test_expect_success 'accept new branch with re in all of three' '
-       git checkout -b topic4 master
+       git checkout -b topic4 master &&
        echo "$test_name first" >a &&
        git commit -a -m "$test_name first re #3222" &&
 
        # the bad one
        echo "$test_name second" >a &&
        git commit -a -m "$test_name second re #3222" &&
-       head=$(git rev-parse HEAD)
+       head=$(git rev-parse HEAD) &&
 
        echo "$test_name third" >a &&
        git commit -a -m "$test_name third re #3222" &&