Tests: rename "dss" to "dsd" (for dgit-ssh-dispatch)

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 019a9984875eb784d4d5041db97d2c82e8c3e646..29812f794850e7c4fb86b117cfb25151723afc87 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -5,7 +5,7 @@ set -x
 
 if [ "x$DGIT_TEST_INTREE" != x ]; then
        : ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
-       : ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/dgit-repos-server}
+       : ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/infra/dgit-repos-server}
        : ${DGIT_SSH_DISPATCH_TEST:=$DGIT_TEST_INTREE/infra/dgit-ssh-dispatch}
        export DGIT_TEST DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
 fi
@@ -263,13 +263,13 @@ t-drs () {
        cp $root/tests/suites $tmp/.
 }
 
-t-dss () {
+t-dsd () {
        t-drs
- t-git-config dgit-distro.test-dummy.ssh "$troot/dss-ssh"
+ t-git-config dgit-distro.test-dummy.ssh "$troot/dsd-ssh"
  t-git-config dgit-distro.test-dummy.git-check ssh-cmd
  t-git-config dgit-distro.test-dummy.git-create true
  t-git-config dgit-distro.test-dummy.git-url \
-               "ext::$troot/dss-ssh X %S /dgit/test-dummy/repos"
+               "ext::$troot/dsd-ssh X %S /dgit/test-dummy/repos"
 
  t-git-config dgit-distro.test-dummy.diverts.drs /drs
  t-git-config dgit-distro.test-dummy/drs.ssh "$troot/ssh"
@@ -277,16 +277,17 @@ t-dss () {
  t-git-config dgit-distro.test-dummy/drs.git-check ssh-cmd
  t-git-config dgit-distro.test-dummy/drs.git-create ssh-cmd
 
-       dss_dispatch=$tmp/dispatch-dir/distro=test-dummy
-       mkdir -p $dss_dispatch
-       ln -sf $root $dss_dispatch/dgit-live
-       ln -sf $tmp/git $dss_dispatch/repos
-       ln -sf $tmp/suites $tmp/dm.txt $dss_dispatch/
-       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
-
-       echo 'no-such-package* drs' >$dss_dispatch/diverts
+       dsd_dispatch=$tmp/dispatch-dir/distro=test-dummy
+       mkdir -p $dsd_dispatch
+       ln -sf $root $dsd_dispatch/dgit-live
+       ln -sf $tmp/git $dsd_dispatch/repos
+       ln -sf $tmp/suites $tmp/dm.txt $dsd_dispatch/
+       mkdir -p $dsd_dispatch/keyrings
+       ln -sf $tmp/dd.gpg $dsd_dispatch/keyrings/debian-keyring.gpg
+       ln -sf $tmp/dm.gpg $dsd_dispatch/keyrings/debian-maintainers.gpg
+       ln -sf /bin/true $dsd_dispatch/policy-hook
+
+       echo 'no-such-package* drs' >$dsd_dispatch/diverts
 }
 
 t-chain-test () {