From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Apr 2015 21:49:14 +0000 (+0100)
Subject: Test suite: break out t-expect-fail
X-Git-Tag: debian/0.30~223
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=bb53fd896dbd2e5d09c56d01b5e0337b865c043d

Test suite: break out t-expect-fail
---

diff --git a/tests/lib b/tests/lib
index 70cda8f6..7a5ede52 100644
--- a/tests/lib
+++ b/tests/lib
@@ -46,6 +46,13 @@ fail () {
 	exit 1
 }
 
+t-expect-fail () {
+	local mpat="$1"; shift
+	LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
+	test ${PIPESTATUS[0]} != 0
+	egrep "$mpat" $tmp/t.output ||false
+}
+
 t-untar () {
 	local tarfile=$1.tar
 	local edittree=$1.edit
diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 2bfa5d5a..419ffd3e 100755
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -8,9 +8,8 @@ cd $p
 t-refs-same-start
 t-ref-head
 
-LC_MESSAGES=C t-dgit push 2>&1 \
-	| tee /dev/stderr \
-	| grep 'package appears to be new in this suite' >/dev/null
+t-expect-fail 'package appears to be new in this suite' \
+t-dgit push
 
 t-dgit build