From b02532fd7d3c82864c76eecbfd99a1abc7e2c1b2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jul 2015 18:06:29 +0100
Subject: For non-Debian distros, debiantag() uses distro name a la DEP-14.

---
 tests/tests/debpolicy-dbretry     |  2 +-
 tests/tests/debpolicy-newreject   |  4 ++--
 tests/tests/drs-push-rejects      | 10 +++++-----
 tests/tests/trustingpolicy-replay | 14 +++++++-------
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'tests/tests')

diff --git a/tests/tests/debpolicy-dbretry b/tests/tests/debpolicy-dbretry
index 1b98f76..d9c2ea2 100755
--- a/tests/tests/debpolicy-dbretry
+++ b/tests/tests/debpolicy-dbretry
@@ -22,7 +22,7 @@ t-commit 'Make something to autotaint'
 t-dgit build
 t-dgit push --new
 
-autotaint=`t-git-get-ref "refs/tags/debian/$v"`
+autotaint=`t-git-get-ref "refs/tags/test-dummy/$v"`
 
 git reset --hard start
 t-commit 'Thing which will autotaint'
diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index c238a5a..6987ef3 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -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
 
@@ -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" \
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 3a70947..3ce1447 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -31,7 +31,7 @@ prep () {
 	cp $tmp/masters/* $tmp/.
 	tag_signer='-u Senatus'
 	tag_message="$p release $version for $suite ($csuite) [dgit]"
-	tag_name=debian/$version
+	tag_name=test-dummy/$version
 	push_spec1="HEAD:refs/dgit/$csuite"
 	push_spec2="refs/tags/$tag_name"
 	push_spec="$push_spec1 $push_spec2"
@@ -101,7 +101,7 @@ mustfail 'push is missing tag ref update' $push_spec1
 mustfail 'push is missing head ref update' +$push_spec2
 mustfail 'pushing unexpected ref' $push_spec HEAD:refs/wombat
 mustfail 'pushing multiple heads' $push_spec HEAD:refs/dgit/wombat
-mustfail 'pushing multiple tags' $push_spec HEAD:refs/tags/debian/wombat
+mustfail 'pushing multiple tags' $push_spec HEAD:refs/tags/test-dummy/wombat
 
 prep unstable sid
 mktag
@@ -128,11 +128,11 @@ mktag HEAD~:
 mustfail 'tag refers to wrong kind of object' $push_spec
 
 prep unstable sid
-tag_name=debian/wombat
+tag_name=test-dummy/wombat
 mktag
-#git update-ref debian/$version debian/wombat
+#git update-ref test-dummy/$version test-dummy/wombat
 mustfail 'tag name in tag is wrong' \
-	refs/tags/debian/wombat:refs/tags/debian/$version $push_spec1
+	refs/tags/test-dummy/wombat:refs/tags/test-dummy/$version $push_spec1
 
 prep unstable sid
 mktag
diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index 2736a52..f2a7043 100755
--- a/tests/tests/trustingpolicy-replay
+++ b/tests/tests/trustingpolicy-replay
@@ -20,7 +20,7 @@ t-dgit build
 t-dgit push
 
 t-rm-dput-dropping
-git checkout debian/1.0
+git checkout test-dummy/1.0
 t-dgit build
 t-dgit push --deliberately-fresh-repo
 
@@ -28,8 +28,8 @@ remote="`git config dgit-distro.test-dummy.git-url`/$p.git"
 
 t-expect-push-fail 'Replay of previously-rewound upload' \
 git push "$remote" \
-	debian/1.1 \
-	debian/1.1~0:refs/dgit/sid
+	test-dummy/1.1 \
+	test-dummy/1.1~0:refs/dgit/sid
 
 git checkout master
 
@@ -57,11 +57,11 @@ prepare-replay () {
 
 attempt-replay () {
 	local mpat=$1
-	git show debian/$replayv | grep -e $delib
+	git show test-dummy/$replayv | grep -e $delib
 	t-expect-push-fail "$mpat" \
 	git push "$remote" \
-		debian/$replayv \
-		+debian/$replayv~0:refs/dgit/sid
+		test-dummy/$replayv \
+		+test-dummy/$replayv~0:refs/dgit/sid
 }
 
 prepare-replay --deliberately-fresh-repo
@@ -77,7 +77,7 @@ t-commit 'later version to stop not fast forward rewinding'
 t-dgit build
 t-dgit push
 
-attempt-replay "does not declare previously tags/debian/$v"
+attempt-replay "does not declare previously tags/test-dummy/$v"
 
 
 echo ok.
-- 
cgit v1.2.3