diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-02 18:25:23 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-31 11:54:08 +0100 |
| commit | 145b3af675c0738fc9c70bea4a7e7330da16292d (patch) | |
| tree | 37684198676288e6f936ceadcaffb7d389b0359a /tests | |
| parent | fcfb42699058a15338d45c492e4640c033ca047b (diff) | |
Tests: Use distro= dir for drs as well as dsd tests; rename the variable; move the directory out of dispatch-dir/
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/dsd-ssh | 2 | ||||
| -rw-r--r-- | tests/lib | 24 | ||||
| -rwxr-xr-x | tests/tests/dsd-divert | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/tests/dsd-ssh b/tests/dsd-ssh index bc179f5..7a075f0 100755 --- a/tests/dsd-ssh +++ b/tests/dsd-ssh @@ -8,6 +8,6 @@ tmp=$DGIT_TEST_TMP cd / userhost="$1"; shift export SSH_ORIGINAL_COMMAND="$*" -${DGIT_SSH_DISPATCH_TEST-dgit-ssh-dispatch} -D $tmp/dispatch-dir +${DGIT_SSH_DISPATCH_TEST-dgit-ssh-dispatch} -D $tmp : '))))))))))))))))))))))))))))))))))))))))' @@ -328,6 +328,16 @@ 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/. + + drs_dispatch=$tmp/distro=test-dummy + mkdir $drs_dispatch + ln -sf $root $drs_dispatch/dgit-live + ln -sf $tmp/git $drs_dispatch/repos + ln -sf $tmp/suites $tmp/dm.txt $drs_dispatch/ + mkdir -p $drs_dispatch/keyrings + ln -sf $tmp/dd.gpg $drs_dispatch/keyrings/debian-keyring.gpg + ln -sf $tmp/dm.gpg $drs_dispatch/keyrings/debian-maintainers.gpg + ln -sf /bin/true $drs_dispatch/policy-hook } t-dsd () { @@ -344,17 +354,7 @@ t-dsd () { t-git-config dgit-distro.test-dummy/drs.git-check ssh-cmd t-git-config dgit-distro.test-dummy/drs.git-create ssh-cmd - 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 + echo 'no-such-package* drs' >$drs_dispatch/diverts } t-policy-admin () { @@ -365,7 +365,7 @@ t-debpolicy () { t-dsd ln -sf ${DGIT_INFRA_PFX}dgit-repos-policy-debian \ - $dsd_dispatch/policy-hook + $drs_dispatch/policy-hook mkdir $tmp/git t-policy-admin create-db diff --git a/tests/tests/dsd-divert b/tests/tests/dsd-divert index 4389b8f..3020a56 100755 --- a/tests/tests/dsd-divert +++ b/tests/tests/dsd-divert @@ -2,6 +2,6 @@ set -e . tests/lib t-dsd -rm $dsd_dispatch/repos -echo '* drs' >>$dsd_dispatch/diverts +rm $drs_dispatch/repos +echo '* drs' >>$drs_dispatch/diverts t-chain-test fetch-somegit-notlast |