X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-newreject;h=10af31fcb81f0ab59293d8be024baca7a1c6f776;hb=26b8f62b600642b1a469a305c3ed8bc0a165a255;hp=c6260a72958d01364169ca2e649c85d1572706b4;hpb=cbe483c32df06d2babbcf99d7ee947c645e7aea3;p=dgit.git

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index c6260a72..10af31fc 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -2,23 +2,13 @@
 set -e
 . tests/lib
 
-t-tstunt dpkg-parsechangelog
+t-tstunt-parsechangelog
 
 t-debpolicy
 t-prep-newpackage example 1.0
 
 cd $p
-
 revision=1
-t-commit () {
-	local msg=$1
-	v=1.$revision
-	dch -v$v --distribution unstable "$1"
-	git add debian/changelog
-	debcommit
-	revision=$(( $revision + 1 ))
-}
-
 git tag start
 
 echo FORBIDDEN >debian/some-file
@@ -28,8 +18,12 @@ t-commit 'Commit a forbidden thing'
 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-fail 'forbidden for testing' \
+t-expect-push-fail 'forbidden for testing' \
 t-dgit push --new
 t-git-dir-check enoent
 
@@ -55,7 +49,7 @@ t-git-dir-check enoent
 t-commit 'should require --deliberately...questionable'
 t-dgit build
 
-t-expect-fail "tag debian/$vanished referred to this object.*all previously pushed versions were found to have been removed" \
+t-expect-push-fail E:"tag debian/${vanished//./\\.} referred to this object.*all previously pushed versions were found to have been removed" \
 t-dgit push --new
 t-git-dir-check enoent
 
@@ -71,18 +65,24 @@ t-git-dir-time-passes
 t-policy-periodic
 t-git-dir-check secret
 
+oldobj=`git rev-parse HEAD`
 git reset --hard start
 t-commit 'should require --deliberately..not-ff'
 t-dgit build
 
-t-expect-fail "HEAD is not a descendant of the archive's version" \
+t-expect-push-fail "HEAD is not a descendant of the archive's version" \
 t-dgit push
 
-t-expect-fail "Package is in NEW and has not been accepted or rejected yet" \
-t-dgit --deliberately-TEST-not-fast-forward-dgit-only push
+t-expect-push-fail "Package is in NEW and has not been accepted or rejected yet" \
+t-dgit --deliberately-TEST-dgit-only-not-fast-forward push
+
+t-dgit --deliberately-not-fast-forward push
+
+cd $tmp/git/$p.git
+t-expect-push-fail "Not a valid object name" \
+git cat-file -p $oldobj
+cd $tmp/$p
 
 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 check expect fail did not push
-echo xxx want to check replay prevention '(delete tag)'
+echo xxx want to t-expect-push-fail leaves HEAD object not dest repo