Bugfixes (now tests/tests/drs-clone-nogit works)

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 0073df4123e56ea48014c11e73be87184c42b057..6aab1522c08257ff1891987f82eeeccf526e548c 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
@@ -261,6 +261,33 @@ 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 () {
+       t-drs
+ t-git-config dgit-distro.test-dummy.ssh "$troot/dss-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"
+
+ t-git-config dgit-distro.test-dummy.diverts.drs /drs
+ t-git-config dgit-distro.test-dummy/drs.ssh "$troot/ssh"
+ t-git-config dgit-distro.test-dummy/drs.git-url $tmp/git
+ 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
 }
 
 t-chain-test () {