chiark / gitweb /
Bugfixes (now all tests pass again)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Mar 2015 17:13:43 +0000 (17:13 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Mar 2015 17:13:43 +0000 (17:13 +0000)
tests/drs-git-ext
tests/lib

index 73dcfa2ec01b05bb24a8af644e881deaf14ad7b1..8116a87438c3cae0bb0c85aa47123e1d65a22e11 100755 (executable)
@@ -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/suites \
        $tmp/dd.gpg,a:$tmp/dm.gpg,m$tmp/dm.txt \
        $tmp/git \
-       $tmp/policy \
+       /bin/true \
        --ssh
 : '))))))))))))))))))))))))))))))))))))))))'
        --ssh
 : '))))))))))))))))))))))))))))))))))))))))'
index 6aab1522c08257ff1891987f82eeeccf526e548c..44f14eede62624b8cec3b2680cc357f06699853b 100644 (file)
--- 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/.
  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-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
        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
 }
 
        echo 'no-such-package* drs' >$dss_dispatch/diverts
 }