From 5d8e32854c1d89e337bc606d423634a667f9b0ff Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 10 Jun 2015 18:25:12 +0100
Subject: Test suite: Move most of mustfail into t-expect-fail

---
 tests/tests/drs-push-rejects | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'tests/tests')

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 640aeae..13567c3 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -11,20 +11,12 @@ t-worktree drs
 cd $p
 
 mustfail () {
-	local wantmsg="$1"; shift
+	local mpat="$1"; shift
 	t-reporefs pre-push
-	set +o pipefail
+
+	t-expect-fail "$mpat" \
 	git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
-	ps="${PIPESTATUS[*]}"
-	set -o pipefail
-	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
+
 	t-reporefs post-push
 	diff $tmp/show-refs.{pre,post}-push
 }
-- 
cgit v1.2.3