From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 31 May 2015 17:31:22 +0000 (+0100)
Subject: Test suite: Make it possible to call t-policy more than once (moving t-dsd out of it)
X-Git-Tag: debian/0.30~109
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=df2685b0b8364f6dfed541113478bbd23a175a01;hp=550a4d5ca9ea2dc83403d6aae926cd151a7fa2aa

Test suite: Make it possible to call t-policy more than once (moving t-dsd out of it)
---

diff --git a/tests/lib b/tests/lib
index aec86127..e6ca6fb3 100644
--- a/tests/lib
+++ b/tests/lib
@@ -425,17 +425,16 @@ t-policy-admin () {
 
 t-policy () {
 	local policyhook=$1
-	t-dsd
-
 	ln -sf ${DGIT_INFRA_PFX}$policyhook \
 		$drs_dispatch/policy-hook
-
-	mkdir $tmp/git
-	t-policy-admin create-db
 }
 
 t-debpolicy () {
+	t-dsd
 	t-policy dgit-repos-policy-debian
+
+	mkdir $tmp/git
+	t-policy-admin create-db
 }
 
 t-policy-periodic () {
diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index f6053aaf..57ef2866 100755
--- a/tests/tests/trustingpolicy-replay
+++ b/tests/tests/trustingpolicy-replay
@@ -4,6 +4,7 @@ set -e
 
 t-tstunt-parsechangelog
 
+t-dsd
 t-policy dgit-repos-policy-trusting
 t-prep-newpackage example 1.0