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 fb9ee38b4ab113e27268a3391ec4bd14ba04d35f..569ca145c4b531fa795aa61749aaed896cc6bf82 100644 (file)
--- 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 79d02b225738514635d629da4d9c17f0e87ca530..8c4ad83cd75acee8b65d289d287404e8f4f05768 100755 (executable)
--- 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