autopkgtests: rename t-refs-same-more to t-refs-same (nfc)

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 94c4c7969ba0702e5a3bd6ff03beef9ee3ad683b..2842b92aadea744a5be09c8faeb8668d8c71f07e 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -32,23 +32,34 @@ incoming            = $tmp/incoming
 run_dinstall           = 0
 END
 
+fail () {
+       echo >&2 "failed: $*"
+       exit 1
+}
+
 t-worktree () {
        rm -rf $p
        tar xf $troot/worktrees/${p}_$1.tar
 }
 
+t-git () {
+       p=$1
+       v=$2
+       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)
 }
 
 t-has-ancestor () {
-       local ancestor=`git rev-parse $1`
        local now=`git rev-parse HEAD`
+       local ancestor=`git rev-parse $1^{}`
        local mbase=`git merge-base $ancestor $now`
        if [ x$mbase != x$ancestor ]; then
-               echo "not ff $ancestor..$now, $mbase != $ancestor"
-               exit 1
+               fail "not ff $ancestor..$now, $mbase != $ancestor"
        fi
 }      
 
@@ -84,6 +95,7 @@ t-diff-nogit () {
 t-cloned-fetched-good () {
        t-diff-nogit ../extract/$p-${v%-*} .
        t-clean-on-branch dgit/sid
+       t-refs-same-start
        t-refs-same \
                refs/heads/dgit/sid \
                refs/remotes/dgit/dgit/sid
@@ -109,52 +121,89 @@ t-git-get-ref () {
        '
 }
 
-t-refs-same () {
-       local f=$1
-       t-git-get-ref $f >$tmp/t.ref1
-       t-refs-same-more "$@"
+t-ref-same () {
+       local name="$1"
+       local val=`t-git-get-ref $name`
+       t-ref-same-val "$name" $val
+}
+
+t-ref-head () {
+       local val=`git rev-parse HEAD`
+       t-ref-same-val HEAD $val
 }
 
-t-refs-same-more () {
+t-ref-same-val () {
+       local name="$1"
+       local val=$2
+       case "$t_ref_val" in
+       '')             ;;
+       "$val")         ;;
+       *)              fail "ref varies: $name: $val != $t_ref_val" ;;
+       esac
+       t_ref_val="$val"
+}
+
+t-refs-same-start () {
+       t_ref_val=''
+}
+
+t-refs-same () {
        local g
        for g in $*; do
-               t-git-get-ref $g >$tmp/t.refn
-               diff $tmp/t.ref1 $tmp/t.refn
+               t-ref-same $g
        done
 }
 
 t-refs-notexist () {
+       local val
        for g in $*; do
-               t-git-get-ref $g >$tmp/t.refx
-               diff /dev/null $tmp/t.refx
+               val=`t-git-get-ref $g >$tmp/t.refx`
+               if [ "x$val" != x ]; then
+                       fail "ref $g unexpectedly exists ($val)"
+               fi
        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 \
+       t-refs-same \
+               refs/heads/$branch \
+               `t-v-tag` \
                refs/remotes/dgit/dgit/sid
        t-refs-notexist \
                refs/heads/dgit/unstable \
                refs/remotes/dgit/dgit/unstable
        (set -e; cd $tmp/git/$p.git
-        t-refs-same-more \
+        t-refs-same \
                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 () {
-       perl -e '
+       local dsc=${p}_${v}.dsc
+       local val=`perl -e '
                use Dpkg::Control::Hash;
                my $h = new Dpkg::Control::Hash allow_pgp=>1;
                $h->parse(\*STDIN,"dsc");
                my $ref = $h->{"Dgit"},"\n";
                die unless $ref =~ m/^\w+\b/;
                print $ref,"\n";
-       ' <$tmp/incoming/${p}_${v}.dsc >$tmp/t.ref1
+       ' <$tmp/incoming/$dsc`
+       t-ref-same-val $dsc "$val"
+}
+
+t-apply-diff () {
+       local v1=$1
+       local v2=$2
+       (cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
+               | patch -p1 -u
 }