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 aec86127d227ac0c4f81af3304ba4be42aa3d470..e6ca6fb399b4a5b6167bbddd3bf4263606a037ea 100644 (file)
--- 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 f6053aaffa51272c8f2038846333174128115467..57ef2866a601647d5f933b6214fb46d93a607c02 100755 (executable)
--- 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