cd $p
revision=1
git tag start
+t-dgit setup-mergechangelogs
echo FORBIDDEN >debian/some-file
git add debian/some-file
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
+'
t-dgit build
t-expect-push-fail 'forbidden for testing' \
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
+vanished=$v
+
t-dgit push --new --deliberately-include-questionable-history
t-git-dir-check secret
t-expect-push-fail "HEAD is not a descendant of the archive's version" \
t-dgit push
-t-expect-push-fail "Package is in NEW and has not been accepted or rejected yet" \
+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
+cd $dgitrepo
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 t-expect-push-fail leaves HEAD object not dest repo
+t-commit 'Still not accepted, will override taint'
+t-dgit build
+t-expect-push-fail \
+ "Package is in NEW and has not been accepted or rejected yet" \
+t-dgit push
+
+t-dgit push --deliberately-include-questionable-history
+
+t-archive-process-incoming sid
+
+t-commit 'Check taint is no longer there'
+t-dgit build
+t-dgit push
+
+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
+
+t-ok