Test suite: Test that taints get auto removed

[dgit.git] / tests / tests / debpolicy-newreject

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 09c1a160411c282da544811ab8e55a3015629bf6..0400c0835c6a16da80b20035963366cd21383c5b 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"
 
+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
@@ -69,7 +73,8 @@ t-dgit build
 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
@@ -79,7 +84,18 @@ t-expect-push-fail "Not a valid object name" \
 git cat-file -p $oldobj
 cd $tmp/$p
 
-echo xxx up to here
+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
+
 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