test suite: baredebian: Break up baredebian-test-core

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 39f13825fc32bdc6bfb2d29ed0c66b2baf2f3f20..3a5b29f432e4567137451bbe8116a3363f2749c5 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -40,6 +40,7 @@ export GIT_COMMITTER_DATE='1530000000 +0100'
 export GIT_AUTHOR_DATE='1530000000 +0100'
 
 export LC_CTYPE=C.UTF-8
+unset CDPATH
 
 root=`pwd`
 troot=$root/tests
@@ -1212,11 +1213,12 @@ t-tagupl-settings () {
 }
 
 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
@@ -1227,10 +1229,13 @@ t-tagupl-test () {
                --distro=test-dummy -u Senatus "$@"
 
        mkdir ../tagupl
-       t-tagupl-run-drs
+       t-tagupl-run-drs $tmp/pretend-salsa
+
+       cd ../pretend-salsa
+       t-refs-same refs/heads/master
+       cd ../$p
 
        t-dgit fetch
-       t-pushed-good master
 }
 
 t-buildproductsdir-config () {