chiark / gitweb /
test suite: t-tagupl-test: Use "salsa" as the source
[dgit.git] / tests / lib
index f6b653fa6578eab6948f5a972ef01a5ecc184c9e..a032945fc79faab0b686291cbdbbd125f6c1863f 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -1202,14 +1202,22 @@ t-tagupl-settings () {
        export DGIT_DRS_SENDMAIL=$troot/tstunt/sendmail
        export DGIT_DRS_DGIT=$troot/tstunt/dgit
        t-chain-test-somehow
+
+       mkdir ../pretend-salsa
+       (set -e; cd ../pretend-salsa; git init --bare)
+       git remote add salsa $tmp/pretend-salsa
+       # git branch --set-upstream-to complains, so
+       git config branch.master.remote salsa
+       git config branch.master.merge refs/heads/master
 }
 
 t-tagupl-run-drs () {
+       local source=$1
        cd ..
        cd tagupl
 
        DGIT_DRS_ANY_URL=1 \
-       DGIT_DRS_MODE="tag2upload $tmp/$p $tagname" \
+       DGIT_DRS_MODE="tag2upload $source $tagname" \
         $troot/drs-git-ext 
 
        cd $tmp/$p
@@ -1217,10 +1225,10 @@ t-tagupl-run-drs () {
 
 t-tagupl-test () {
        ${DGIT_DEBPUSH_TEST-git debpush} \
-               --distro=test-dummy --no-push -u Senatus "$@"
+               --distro=test-dummy -u Senatus "$@"
 
        mkdir ../tagupl
-       t-tagupl-run-drs
+       t-tagupl-run-drs $tmp/pretend-salsa
 
        t-dgit fetch
        t-pushed-good master