X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-newreject;h=93e188dff228885d59d8157ed61ca943859f4380;hp=bf9824ac9cb82130bae41c78cde4864d3e1f6403;hb=e3a629cbad9501d8e92b7ed04f7c545583c8550b;hpb=1a0df2300792f856dc03e71ef0d5ceac38113df8

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index bf9824ac..93e188df 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -7,10 +7,19 @@ 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 ))
+}
 
 echo FORBIDDEN >debian/some-file
 git add debian/some-file
-git commit -m 'Commit a forbidden thing'
+t-commit 'Commit a forbidden thing'
 
 bad=`git rev-parse HEAD:debian/some-file`
 t-policy-admin taint --global "$bad" "forbidden for testing"
@@ -18,27 +27,35 @@ t-policy-admin taint --global "$bad" "forbidden for testing"
 t-dgit build
 t-expect-fail 'forbidden for testing' \
 t-dgit push --new
+t-git-dir-check enoent
 
 git reset --hard HEAD~
-git commit --allow-empty -m 'will vanish from NEW'
+t-commit 'will vanish from NEW'
+vanished=$v
 t-dgit build
 t-dgit push --new
+t-git-dir-check secret
 
 t-policy-periodic
+t-git-dir-check secret
 
 # pretend it vanished from new:
 rm $tmp/incoming/*
 t-archive-none example
-touch -d 'last year' $tmp/git/$p.git
+
+t-git-dir-time-passes
 
 t-policy-periodic
+t-git-dir-check enoent
 
-git commit --allow-empty -m 'should require --deliberately...questionable'
+t-commit 'should require --deliberately...questionable'
 t-dgit build
 
-t-expect-fail 'tag debian/1.0 referred to this object.*all previously pushed versions were found to have been removed' \
+t-expect-fail "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
 
 t-dgit push --new --deliberately-include-questionable-history
+t-git-dir-check secret
 
 echo xxx up to here