chiark / gitweb /
Tests: rename "dss" to "dsd" (for dgit-ssh-dispatch)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Mar 2015 17:19:22 +0000 (17:19 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Mar 2015 17:19:22 +0000 (17:19 +0000)
tests/dsd-ssh [moved from tests/dss-ssh with 100% similarity]
tests/lib
tests/tests/dsd-clone-nogit [moved from tests/tests/dss-clone-nogit with 100% similarity]
tests/tests/dsd-divert [moved from tests/tests/dss-divert with 50% similarity]

similarity index 100%
rename from tests/dss-ssh
rename to tests/dsd-ssh
index 44f14ee..29812f7 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -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,17 +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
-       ln -sf /bin/true $dss_dispatch/policy-hook
-
-       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 () {
similarity index 50%
rename from tests/tests/dss-divert
rename to tests/tests/dsd-divert
index 60ff085..4389b8f 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 . tests/lib
-t-dss
-rm $dss_dispatch/repos
-echo '* drs' >>$dss_dispatch/diverts
+t-dsd
+rm $dsd_dispatch/repos
+echo '* drs' >>$dsd_dispatch/diverts
 t-chain-test fetch-somegit-notlast