autopkgtests: fetch-localgitonly: rename from fetch-nogit

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index fb6059ba835d456cb0f795cfd0be535c5fd9e3fb..4a40e7769ec34177e393f6421ac916127f840361 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -37,6 +37,11 @@ t-worktree () {
        tar xf $troot/worktrees/${p}_$1.tar
 }
 
+t-git () {
+       mkdir -p $tmp/git
+       (set -e; cd $tmp/git; tar xf $troot/git-srcs/${p}_$v.git.tar)
+}
+
 t-git-none () {
        mkdir -p $tmp/git
        (set -e; cd $tmp/git; tar xf $troot/git-template.tar)
@@ -130,11 +135,16 @@ t-refs-notexist () {
        done
 }
 
+t-v-tag () {
+       echo refs/tags/debian/${v//\~/_}
+}
+
 t-pushed-good () {
+       local branch=$1
        t-ref-dsc-dgit
        t-refs-same-more \
-               refs/heads/master \
-               refs/tags/debian/$v \
+               refs/heads/$branch \
+               `t-v-tag` \
                refs/remotes/dgit/dgit/sid
        t-refs-notexist \
                refs/heads/dgit/unstable \
@@ -142,10 +152,11 @@ t-pushed-good () {
        (set -e; cd $tmp/git/$p.git
         t-refs-same-more \
                refs/dgit/sid \
-               refs/tags/debian/$v
+               `t-v-tag`
         t-refs-notexist \
                refs/dgit/unstable
        )
+       git verify-tag `t-v-tag`
 }
 
 t-ref-dsc-dgit () {