From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 5 Jan 2017 15:37:49 +0000 (+0000)
Subject: test suite: Introduce t-expect-fsck-fail
X-Git-Tag: debian/2.15~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6cbd45af603bc976c8334f839cebefbad2b3a622;p=dgit.git

test suite: Introduce t-expect-fsck-fail

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/lib b/tests/lib
index fb9ee38b..569ca145 100644
--- a/tests/lib
+++ b/tests/lib
@@ -349,6 +349,10 @@ t-git-dir-check () {
 	esac
 }
 
+t-expect-fsck-fail () {
+	expect_fsck_fail+=" $1"
+}
+
 t-git-fsck () {
 	git fsck --no-dangling --strict || ${expect_fsck_fail:+true} false
 }
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 79d02b22..8c4ad83c 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -85,7 +85,7 @@ for h in object type tag; do
 
     mustfail 'multiple headers '$h' in signed tag object' $push_spec
 
-    expect_fsck_fail+=" $badtag"
+    t-expect-fsck-fail $badtag
   done
 done
 
@@ -147,7 +147,7 @@ badcommit=$(
 	perl -pe 's/^committer.*\n//' | \
 	git hash-object -w -t commit --stdin
 )
-expect_fsck_fail+=" $badcommit"
+t-expect-fsck-fail $badcommit
 git checkout -b broken $badcommit
 prep unstable sid
 mktag