Tests: debpolicy-newreject: Make each tree a new version (with dch and debcommit)

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 4435b55c4b72825818643e88542e03b77e87e3d7..3c31a29cb11ff689128bb791d563002cf48f9bd3 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -3,13 +3,9 @@
 exec 2>&1
 set -x
 
-if [ "x$DGIT_TEST_INTREE" != x ]; then
-       : ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
-       : ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/infra/dgit-repos-server}
-       : ${DGIT_SSH_DISPATCH_TEST:=$DGIT_TEST_INTREE/infra/dgit-ssh-dispatch}
-       : ${DGIT_INFRA_PFX:=$DGIT_TEST_INTREE${DGIT_TEST_INTREE:+/infra/}}
-       export DGIT_TEST DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
-fi
+. tests/lib-core
+
+t-set-intree
 
 : ${DGIT_TEST_DEBUG:=-D}
 export DGIT_TEST_DEBUG
@@ -45,11 +41,6 @@ incoming             = $tmp/incoming
 run_dinstall           = 0
 END
 
-fail () {
-       echo >&2 "failed: $*"
-       exit 1
-}
-
 t-expect-fail () {
        local mpat="$1"; shift
        LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
@@ -99,23 +90,27 @@ t-prep-newpackage () {
        v=$2
        t-archive-none $p
        t-git-none
-       v=3-1
        t-worktree $v
        cd $p
-       git branch -m dgit/sid master
-       git remote rm dgit
+       if ! git-show-ref --verify --quiet refs/heads/master; then
+               git branch -m dgit/sid master
+               git remote rm dgit
+       fi
        cd ..
 }
 
 t-archive-none () {
        p=$1
        mkdir -p $tmp/aq $tmp/mirror/pool/main
-       mkdir -p $tmp/aq/dsc_in_suite $tmp/aq/dsc_in_suite/sid
 
        local suite=sid
+
        >$tmp/aq/package.$suite.$p
        t-archive-updated $suite $p
 
+       >$tmp/aq/package.new.$p
+       t-archive-updated new $p
+
        ln -s sid $tmp/aq/dsc_in_suite/unstable
        cat <<'END' >$tmp/aq/suites
 [
@@ -137,7 +132,9 @@ END
 t-archive-updated () {
        local suite=$1
        local p=$2
-       perl <$tmp/aq/package.$suite.$p >$tmp/aq/dsc_in_suite/$suite/$p -wne '
+       local suitedir=$tmp/aq/dsc_in_suite/$suite
+       mkdir -p $suitedir
+       perl <$tmp/aq/package.$suite.$p >$suitedir/$p -wne '
                use JSON;
                use strict;
                our @v;
@@ -155,15 +152,17 @@ t-archive-updated () {
 }
 
 t-archive-process-incoming () {
-       mv incoming/${p}_${v}[._]* mirror/pool/main/
-       t-archive-query
+       local suite=$1
+       mv $tmp/incoming/${p}_${v}[._]* $tmp/mirror/pool/main/
+       t-archive-query "$suite"
 }
 
 t-archive-query () {
+       local suite=${1-sid}
        local dscf=main/${p}_${v}.dsc
-       local sha=`sha256sum <mirror/pool/$dscf`
-       echo "${v} ${sha%  -} $dscf" >>$tmp/aq/package.sid.${p}
-       t-archive-updated sid $p
+       local sha=`sha256sum <$tmp/mirror/pool/$dscf`
+       echo "${v} ${sha%  -} $dscf" >>$tmp/aq/package.$suite.${p}
+       t-archive-updated $suite $p
 }
 
 t-archive () {
@@ -178,6 +177,28 @@ t-archive () {
        (set -e; cd $tmp/extract; dpkg-source -x ../mirror/pool/main/$dscf)
 }
 
+t-git-dir-time-passes () {
+       touch -d 'last year' $tmp/git/$p.git
+}
+
+t-git-dir-check () {
+       local gitdir=$tmp/git/$p.git
+       case "$1" in
+       enoent)
+               if test -e "$gitdir"; then fail "$gitdir exists"; fi
+               return
+               ;;
+       public) wantstat='7[75]5' ;;
+       secret) wantstat='7[70]0' ;;
+       *)      fail "$1 t-git-dir-check ?" ;;
+       esac
+       gotstat=`stat -c%a $gitdir`
+       case "$gotstat" in
+       *$wantstat) return ;;
+       *)      fail "$gitdir has mode $gotstat, expected $wantstat" ;;
+       esac
+}
+
 t-dgit () {
        local dgit=${DGIT_TEST-dgit}
        : '
@@ -371,6 +392,11 @@ t-debpolicy () {
        t-policy-admin create-db
 }
 
+t-policy-periodic () {
+       ${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
+               test-dummy $drs_dispatch '' --cron
+}
+
 t-chain-test () {
        local ct=$1
        local d=${0%/*}