From 3c5bd4a131492e85a269bbec3eba86a9e1387c25 Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Fri, 18 Jun 2010 21:43:53 +0530 Subject: [PATCH] test suite: catch internal errors better ...so you don't have to look at all the output for any strangeness (also make rollback a little quieter) --- t/rollback | 2 +- t/t-fedora-big-config | 2 +- t/t00-initial | 4 +++- t/t01-repo-groups | 10 ++++++---- t/t02-user-groups | 10 ++++++---- t/t03-branch-permissions | 6 ++++-- t/t04-wild | 2 +- t/t05a-delegation | 2 +- t/t09a-oldtests | 2 +- t/t50-sequence-test | 4 ++-- t/t51-personal-branches | 2 +- t/t52-deny-create-ref | 2 +- t/t53-check-info-expand-output | 2 +- t/test-driver.sh | 3 +-- 14 files changed, 30 insertions(+), 23 deletions(-) diff --git a/t/rollback b/t/rollback index 4fdb260..84f3872 100755 --- a/t/rollback +++ b/t/rollback @@ -7,5 +7,5 @@ rm -rf gitolite-admin td tar xf rollback.tar mkdir td -scp $TESTDIR/rollback.server gitolite-test@localhost:rollback +scp -q $TESTDIR/rollback.server gitolite-test@localhost:rollback || { echo scp failed; exit 1; } ssh gitolite-test@localhost ./rollback diff --git a/t/t-fedora-big-config b/t/t-fedora-big-config index 6604bd0..74c9ca2 100644 --- a/t/t-fedora-big-config +++ b/t/t-fedora-big-config @@ -1,6 +1,6 @@ # vim: syn=sh: cd $TESTDIR -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 1 editrc GL_NO_DAEMON_NO_GITWEB 1 catrc diff --git a/t/t00-initial b/t/t00-initial index 39c1cbe..d708fdd 100644 --- a/t/t00-initial +++ b/t/t00-initial @@ -1,5 +1,5 @@ # vim: syn=sh: -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" # ---------- name "basic push admin repo" @@ -68,3 +68,5 @@ runlocal git reset --hard HEAD^ mdc runlocal git push -f origin HEAD expect "remote: + refs/heads/master aa u2 DENIED by fallthru" + +name INTERNAL diff --git a/t/t01-repo-groups b/t/t01-repo-groups index d879894..d738def 100644 --- a/t/t01-repo-groups +++ b/t/t01-repo-groups @@ -1,6 +1,6 @@ # vim: syn=sh: # ---------- -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 0 name "base output with no groups" @@ -14,7 +14,7 @@ catconf expect_filesame $TESTDIR/out/t01-repo-groups.1 # ---------- -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 0 name "output with eqvt repo groups" @@ -29,7 +29,7 @@ catconf expect_filesame $TESTDIR/out/t01-repo-groups.1 # ---------- -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 1 name "base output with no groups but GL_BIG_CONFIG on" @@ -43,7 +43,7 @@ catconf expect_filesame $TESTDIR/out/t01-repo-groups.1 # ---------- -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 1 name "repo groups with GL_BIG_CONFIG on" @@ -56,3 +56,5 @@ echo " catconf expect_filesame $TESTDIR/out/t01-repo-groups.2 + +name INTERNAL diff --git a/t/t02-user-groups b/t/t02-user-groups index 29d98ce..bc17e17 100644 --- a/t/t02-user-groups +++ b/t/t02-user-groups @@ -1,6 +1,6 @@ # vim: syn=sh: # ---------- -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 0 name "base output with no groups" @@ -14,7 +14,7 @@ catconf expect_filesame $TESTDIR/out/t02-user-groups.1 # ---------- -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 0 name "output with eqvt user groups" @@ -32,7 +32,7 @@ catconf expect_filesame $TESTDIR/out/t02-user-groups.1 # ---------- -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 1 name "base output with no groups but GL_BIG_CONFIG on" @@ -46,7 +46,7 @@ catconf expect_filesame $TESTDIR/out/t02-user-groups.1 # ---------- -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 1 name "user groups with GL_BIG_CONFIG on" @@ -62,3 +62,5 @@ echo " catconf expect_filesame $TESTDIR/out/t02-user-groups.2 + +name INTERNAL diff --git a/t/t03-branch-permissions b/t/t03-branch-permissions index c1766c1..f8ef19c 100644 --- a/t/t03-branch-permissions +++ b/t/t03-branch-permissions @@ -1,6 +1,6 @@ # vim: syn=sh: # ---------- -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 0 echo ===== testing with GL_BIG_CONFIG set to 0 ===== @@ -10,7 +10,7 @@ cd $TESTDIR cd $TESTDIR # ---------- -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG 1 echo ===== testing with GL_BIG_CONFIG set to 1 ===== @@ -18,3 +18,5 @@ echo ===== testing with GL_BIG_CONFIG set to 1 ===== cd $TESTDIR . ./t03a-branch-permissions cd $TESTDIR + +name INTERNAL diff --git a/t/t04-wild b/t/t04-wild index e7b5464..7efbf02 100644 --- a/t/t04-wild +++ b/t/t04-wild @@ -8,7 +8,7 @@ do hl t04-wild with GL_WILDREPOS $i, C=@$j cd $TESTDIR - $TESTDIR/rollback + $TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG $i editrc GL_WILDREPOS 1 . ./t04a-wild-$j diff --git a/t/t05a-delegation b/t/t05a-delegation index 40243d0..8fcdbca 100644 --- a/t/t05a-delegation +++ b/t/t05a-delegation @@ -1,6 +1,6 @@ # vim: syn=sh: cd $TESTDIR -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG $1 # ---------- diff --git a/t/t09a-oldtests b/t/t09a-oldtests index 1ab3b6e..16edb61 100644 --- a/t/t09a-oldtests +++ b/t/t09a-oldtests @@ -1,6 +1,6 @@ # vim: syn=sh: cd $TESTDIR -$TESTDIR/rollback +$TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG $1 name "bad repo name" diff --git a/t/t50-sequence-test b/t/t50-sequence-test index 6014e50..4c540f7 100644 --- a/t/t50-sequence-test +++ b/t/t50-sequence-test @@ -2,7 +2,7 @@ for bc in 0 1 do cd $TESTDIR - $TESTDIR/rollback + $TESTDIR/rollback || die "rollback failed" editrc GL_WILDREPOS 1 editrc GL_BIG_CONFIG $bc @@ -48,7 +48,7 @@ do name "INTERNAL" cd $TESTDIR - $TESTDIR/rollback + $TESTDIR/rollback || die "rollback failed" editrc GL_WILDREPOS 1 editrc GL_BIG_CONFIG $bc diff --git a/t/t51-personal-branches b/t/t51-personal-branches index dbbeb55..d040bc4 100644 --- a/t/t51-personal-branches +++ b/t/t51-personal-branches @@ -4,7 +4,7 @@ do for bc in 0 1 do cd $TESTDIR - $TESTDIR/rollback + $TESTDIR/rollback || die "rollback failed" editrc GL_WILDREPOS $wr editrc GL_BIG_CONFIG $bc diff --git a/t/t52-deny-create-ref b/t/t52-deny-create-ref index 9afa369..3aa9e83 100644 --- a/t/t52-deny-create-ref +++ b/t/t52-deny-create-ref @@ -2,7 +2,7 @@ for bc in 0 1 do cd $TESTDIR - $TESTDIR/rollback + $TESTDIR/rollback || die "rollback failed" editrc GL_BIG_CONFIG $bc # ---------- diff --git a/t/t53-check-info-expand-output b/t/t53-check-info-expand-output index b5bbbbc..43bb938 100644 --- a/t/t53-check-info-expand-output +++ b/t/t53-check-info-expand-output @@ -4,7 +4,7 @@ do for bc in 0 1 do cd $TESTDIR - $TESTDIR/rollback + $TESTDIR/rollback || die "rollback failed" editrc GL_WILDREPOS $wr editrc GL_BIG_CONFIG $bc diff --git a/t/test-driver.sh b/t/test-driver.sh index fbfbce0..416000d 100755 --- a/t/test-driver.sh +++ b/t/test-driver.sh @@ -152,9 +152,8 @@ arg1=$1; shift for testfile in ${arg1:-t??-}* do hl $testfile - . $testfile "$@" + . $testfile "$@" || die "$testfile failed" cd $TESTDIR - hl $testfile DONE done print_summary