git-debrebase: merge: New record-resolved-merge subcommand, WIP

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

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index ed4a1446d2a930cf0e95e6c0a13efd2d5b6347c0..1fa6751782df0adc8b5d996d6701da8f76ea9e65 100755 (executable)
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -51,7 +51,7 @@ t-git-dir-check enoent
 t-commit 'should require --deliberately...questionable'
 t-dgit build
 
-t-expect-push-fail E:"tag test-dummy/${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
 
@@ -102,7 +102,7 @@ t-commit 'Check taint is no longer there'
 t-dgit build
 t-dgit push
 
-git checkout -b stoats test-dummy/$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" \
@@ -118,4 +118,4 @@ t-expect-push-fail \
     'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
 t-dgit push
 
-echo ok.
+t-ok