X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdrs-push-rejects;h=3a709472efdb2b3fada31f544cf78eab6db03ee1;hp=fdd390dfa837e6f38d71a2098f81fb3be7295656;hb=81e28f0e284a89d8ede573bad8cd494c911099d1;hpb=4383b44c16571b49dd741987a1dc49d145242039;ds=sidebyside

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index fdd390df..3a709472 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -10,37 +10,16 @@ t-worktree drs
 
 cd $p
 
-reporefs () {
-	(set -e
-	if test -d $tmp/git/$p.git; then
-		cd $tmp/git/$p.git
-		git show-ref
-	fi)
-}
-
 mustfail () {
-	local wantmsg="$1"; shift
-	reporefs >$tmp/show-refs.pre-push
-	set +e
-	git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
-	ps="${PIPESTATUS[*]}"
-	set -e
-	case $ps in
-	"0 0")	fail "push unexpectedly succeeded (instead of: $wantmsg)" ;;
-	*" 0")	;;
-	*)	fail "tee failed"  ;;
-	esac
-	if ! fgrep "$wantmsg" $tmp/mustfail.txt >/dev/null; then
-		fail "error message not found"
-	fi
-	reporefs >$tmp/show-refs.post-push
-	diff $tmp/show-refs.{pre,post}-push
+	local mpat="$1"; shift
+	t-expect-push-fail "$mpat" \
+	git push origin "$@"
 }
 
 mustsucceed () {
-	reporefs >$tmp/show-refs.pre-push
+	t-reporefs pre-push
 	git push origin "$@"
-	reporefs >$tmp/show-refs.post-push
+	t-reporefs post-push
 	if diff $tmp/show-refs.{pre,post}-push >$tmp/show-refs.diff; then
 		fail "no refs updated"
 	fi
@@ -86,7 +65,7 @@ for h in object type tag; do
     cat badtag.asc >>badtag
 
     set +e
-    LC_ALL=C git hash-object -w -t tag badtag >badtag.hash 2>badtag.err
+    LC_MESSAGES=C git hash-object -w -t tag badtag >badtag.hash 2>badtag.err
     rc=$?
     set -e
 
@@ -119,7 +98,7 @@ mustfail 'sid != sponge' HEAD:refs/dgit/sponge $push_spec2
 prep unstable sid
 mktag
 mustfail 'push is missing tag ref update' $push_spec1
-mustfail 'push is missing head ref update' $push_spec2
+mustfail 'push is missing head ref update' +$push_spec2
 mustfail 'pushing unexpected ref' $push_spec HEAD:refs/wombat
 mustfail 'pushing multiple heads' $push_spec HEAD:refs/dgit/wombat
 mustfail 'pushing multiple tags' $push_spec HEAD:refs/tags/debian/wombat
@@ -128,6 +107,7 @@ prep unstable sid
 mktag
 echo woody >$tmp/suites
 mustfail 'unknown suite' $push_spec
+cp $root/tests/suites $tmp/.
 
 # fixme:
 #    or reject "command string not understood";
@@ -159,7 +139,12 @@ mktag
 mustsucceed $push_spec # succeeds
 
 mktag
-mustfail 'not replacing previously-pushed version' $push_spec
+mustfail 'push is missing head ref update' $push_spec1 +$push_spec2
+
+git commit --allow-empty -m 'Dummy update'
+mktag
+mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
+git reset --hard HEAD~
 
 prep_dm_mangle () {
 	prep unstable sid