Test suite: test forbidden objects not present

diff --git a/tests/lib b/tests/lib
index f45dd0b2bb80ecbdec39807d471cac72bf2f531d..03c25ce335ac3b96334c48673de29fe558840e82 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -78,6 +78,19 @@ t-expect-push-fail () {
        t-expect-fail "$mpat"  "$@"
        t-reporefs post-push
        diff $tmp/show-refs.{pre,post}-push
        t-expect-fail "$mpat"  "$@"
        t-reporefs post-push
        diff $tmp/show-refs.{pre,post}-push

+
+       eval "$t_expect_push_fail_hook"
+}
+
+t-git-objects-not-present () {
+       local gitdir="${1-$tmp/git/$p.git}"
+       local obj
+       if ! [ -e "$gitdir" ]; then return; fi
+       for obj in "$@"; do
+               GIT_DIR=$gitdir \
+               t-expect-fail 'unable to find' \
+               git cat-file -t $obj
+       done

 }
 
 t-reporefs () {
 }
 
 t-reporefs () {

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 09c1a160411c282da544811ab8e55a3015629bf6..10af31fcb81f0ab59293d8be024baca7a1c6f776 100755 (executable)
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -18,6 +18,10 @@ t-commit 'Commit a forbidden thing'
 bad=`git rev-parse HEAD:debian/some-file`
 t-policy-admin taint --global "$bad" "forbidden for testing"
 
 bad=`git rev-parse HEAD:debian/some-file`
 t-policy-admin taint --global "$bad" "forbidden for testing"
 

+t_expect_push_fail_hook+='
+t-git-objects-not-present "" $bad
+'
+

 t-dgit build
 t-expect-push-fail 'forbidden for testing' \
 t-dgit push --new
 t-dgit build
 t-expect-push-fail 'forbidden for testing' \
 t-dgit push --new


@@ -81,5 +85,4 @@ cd $tmp/$p
 
 echo xxx up to here
 echo xxx want to test database lock retry thing on push-and-taint
 
 echo xxx up to here
 echo xxx want to test database lock retry thing on push-and-taint

-echo xxx want to test forbidden objects not present

 echo xxx want to t-expect-push-fail leaves HEAD object not dest repo
 echo xxx want to t-expect-push-fail leaves HEAD object not dest repo