diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-03-22 17:19:22 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-03-22 17:19:22 +0000 |
commit | d5013886bfac8d8997d1e4ec8fd32f1a0a6e62d1 (patch) | |
tree | 3bd6750966dc94e65c941ad9d970b510609ae0c2 /tests | |
parent | f4bc05ca3e517328907a64a0dd1ca55d74306740 (diff) |
Tests: rename "dss" to "dsd" (for dgit-ssh-dispatch)
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/dsd-ssh (renamed from tests/dss-ssh) | 0 | ||||
-rw-r--r-- | tests/lib | 28 | ||||
-rwxr-xr-x | tests/tests/dsd-clone-nogit (renamed from tests/tests/dss-clone-nogit) | 0 | ||||
-rwxr-xr-x | tests/tests/dsd-divert (renamed from tests/tests/dss-divert) | 6 |
4 files changed, 17 insertions, 17 deletions
diff --git a/tests/dss-ssh b/tests/dsd-ssh index bc179f5..bc179f5 100755 --- a/tests/dss-ssh +++ b/tests/dsd-ssh @@ -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 () { diff --git a/tests/tests/dss-clone-nogit b/tests/tests/dsd-clone-nogit index 915f9d3..915f9d3 100755 --- a/tests/tests/dss-clone-nogit +++ b/tests/tests/dsd-clone-nogit diff --git a/tests/tests/dss-divert b/tests/tests/dsd-divert index 60ff085..4389b8f 100755 --- a/tests/tests/dss-divert +++ b/tests/tests/dsd-divert @@ -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 |