From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Mar 2015 17:13:43 +0000 (+0000)
Subject: Bugfixes (now all tests pass again)
X-Git-Tag: debian/0.30~238
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f4bc05ca3e517328907a64a0dd1ca55d74306740

Bugfixes (now all tests pass again)
---

diff --git a/tests/drs-git-ext b/tests/drs-git-ext
index 73dcfa2e..8116a874 100755
--- a/tests/drs-git-ext
+++ b/tests/drs-git-ext
@@ -10,6 +10,6 @@ ${DGIT_REPOS_SERVER_TEST-dgit-repos-server} test-dummy \
 	$tmp/suites \
 	$tmp/dd.gpg,a:$tmp/dm.gpg,m$tmp/dm.txt \
 	$tmp/git \
-	$tmp/policy \
+	/bin/true \
 	--ssh
 : '))))))))))))))))))))))))))))))))))))))))'
diff --git a/tests/lib b/tests/lib
index 6aab1522..44f14eed 100644
--- a/tests/lib
+++ b/tests/lib
@@ -261,7 +261,6 @@ t-drs () {
  t-git-config dgit-distro.test-dummy.git-create true
 	cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
 	cp $root/tests/suites $tmp/.
-	ln -s /bin/true $tmp/policy
 }
 
 t-dss () {
@@ -286,6 +285,7 @@ t-dss () {
 	mkdir -p $dss_dispatch/keyrings
 	ln -sf $tmp/dd.gpg $dss_dispatch/keyrings/debian-keyring.gpg
 	ln -sf $tmp/dm.gpg $dss_dispatch/keyrings/debian-maintainers.gpg
+	ln -sf /bin/true $dss_dispatch/policy-hook
 
 	echo 'no-such-package* drs' >$dss_dispatch/diverts
 }