summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/lib2
-rwxr-xr-xtests/tests/drs-push-rejects6
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib b/tests/lib
index 5fcb6f6..fb9ee38 100644
--- a/tests/lib
+++ b/tests/lib
@@ -350,7 +350,7 @@ t-git-dir-check () {
}
t-git-fsck () {
- git fsck --no-dangling --strict || ${expect_fsck_fail-false}
+ git fsck --no-dangling --strict || ${expect_fsck_fail:+true} false
}
t-fscks () {
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index dee14b8..79d02b2 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -84,6 +84,8 @@ for h in object type tag; do
git update-ref refs/tags/$tag_name $badtag
mustfail 'multiple headers '$h' in signed tag object' $push_spec
+
+ expect_fsck_fail+=" $badtag"
done
done
@@ -145,6 +147,7 @@ badcommit=$(
perl -pe 's/^committer.*\n//' | \
git hash-object -w -t commit --stdin
)
+expect_fsck_fail+=" $badcommit"
git checkout -b broken $badcommit
prep unstable sid
mktag
@@ -203,7 +206,4 @@ mustfail "not in permissions list although in keyring" $push_spec
prep_dm_mangle ''
mustsucceed $push_spec # succeeds
-# we generate some junk, so we must tolerate git-fsck complaining
-expect_fsck_fail=true
-
t-ok