test suite: t-tagupl-test: Use "salsa" as the source

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 36de84b6ad3094fe7f8a51793eddd0ddec9faff7..a032945fc79faab0b686291cbdbbd125f6c1863f 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -31,6 +31,9 @@ t-set-intree
 : ${DGIT_TEST_DEBUG=-D}
 export DGIT_TEST_DEBUG
 
+: ${DGIT_TEST_DEBPUSH_DEBUG=x}
+export DGIT_TEST_DEBPUSH_DEBUG
+
 : ${DGIT_TEST_DISTRO+ ${distro=${DGIT_TEST_DISTRO}}}
 
 export GIT_COMMITTER_DATE='1530000000 +0100'
@@ -1199,21 +1202,33 @@ t-tagupl-settings () {
        export DGIT_DRS_SENDMAIL=$troot/tstunt/sendmail
        export DGIT_DRS_DGIT=$troot/tstunt/dgit
        t-chain-test-somehow
-}
 
-t-tagupl-test () {
-       ${DGIT_DEBPUSH_TEST-git debpush} \
-               --distro=test-dummy --no-push -u Senatus "$@"
+       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 ..
-       mkdir tagupl
        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
+}
+
+t-tagupl-test () {
+       ${DGIT_DEBPUSH_TEST-git debpush} \
+               --distro=test-dummy -u Senatus "$@"
+
+       mkdir ../tagupl
+       t-tagupl-run-drs $tmp/pretend-salsa
 
        t-dgit fetch
        t-pushed-good master