X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-newreject;h=1fa6751782df0adc8b5d996d6701da8f76ea9e65;hp=2204244ab7163f10d45f7177b51458e5980bfced;hb=5ad9edffc1e0658f287b45feccbd7c97e0bfd412;hpb=70e9ff4d8096221e391358be6ca680bdfa1af298

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 2204244a..1fa67517 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -10,7 +10,7 @@ t-prep-newpackage example 1.0
 cd $p
 revision=1
 git tag start
-t-prep-mergechangelogs
+t-dgit setup-mergechangelogs
 
 echo FORBIDDEN >debian/some-file
 git add debian/some-file
@@ -18,6 +18,7 @@ t-commit 'Commit a forbidden thing'
 
 bad=`git rev-parse HEAD:debian/some-file`
 t-policy-admin taint --global "$bad" "forbidden for testing"
+t-policy-admin taint --global "$bad" "forbidden for testing - again"
 
 t_expect_push_fail_hook+='
 t-git-objects-not-present "" $bad
@@ -50,7 +51,7 @@ t-git-dir-check enoent
 t-commit 'should require --deliberately...questionable'
 t-dgit build
 
-t-expect-push-fail E:"tag debian/${vanished//./\\.} referred to this object.*all previously pushed versions were found to have been removed" \
+t-expect-push-fail E:"tag $tagpfx/${vanished//./\\.} referred to this object.*all previously pushed versions were found to have been removed" \
 t-dgit push --new
 t-git-dir-check enoent
 
@@ -82,7 +83,7 @@ t-dgit --deliberately-TEST-dgit-only-not-fast-forward push
 
 t-dgit --deliberately-not-fast-forward push
 
-cd $tmp/git/$p.git
+cd $dgitrepo
 t-expect-push-fail "Not a valid object name" \
 git cat-file -p $oldobj
 cd $tmp/$p
@@ -101,16 +102,20 @@ t-commit 'Check taint is no longer there'
 t-dgit build
 t-dgit push
 
-git checkout -b stoats debian/$vanished
+git checkout -b stoats $tagpfx/$vanished
 t-commit 'Simulate accidentally building on rejected version'
 t-dgit build
 t-expect-push-fail "HEAD is not a descendant of the archive's version" \
 t-dgit push
 
+: "check that uploader can't force it now"
+t-expect-push-fail "not fast forward on dgit branch" \
+t-dgit --deliberately-not-fast-forward push
+
 t-dgit pull
 t-dgit build
 t-expect-push-fail \
     'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
 t-dgit push
 
-echo xxx want to test database lock retry thing on push-and-taint
+t-ok