X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-newreject;h=3f3114b2454790995f5577341327024468c38a95;hb=7de3df349f56e05723b3eeb7972aaea4d9fc1000;hp=2e1bf88aaa3cbed16182abcf086c5f5ff9c289ba;hpb=523f605a62b7f559108b8b7301a88bfaaeb6d4e8;p=dgit.git

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 2e1bf88a..3f3114b2 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
@@ -50,7 +50,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 test-dummy/${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 +82,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,7 +101,7 @@ t-commit 'Check taint is no longer there'
 t-dgit build
 t-dgit push
 
-git checkout -b stoats debian/$vanished
+git checkout -b stoats test-dummy/$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" \
@@ -117,4 +117,4 @@ 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
+echo ok.