From e3d689abb4446aa168d150d2832fe9fd76933dcc Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 5 Jan 2017 15:30:13 +0000 Subject: [PATCH] test suite: Make expect_fsck_fail contain objids This will make it possible to be stricter. Signed-off-by: Ian Jackson --- tests/lib | 2 +- tests/tests/drs-push-rejects | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/lib b/tests/lib index 5fcb6f65..fb9ee38b 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 dee14b86..79d02b22 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 -- 2.30.2