Tests: break out some things into lib-core (nfc)

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 1516646f23ae1d239be725cb0ccf468afa8ca00f..0e188cca4280e83cf1f3de309198901c226b8cf7 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -3,12 +3,12 @@
 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}
-       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
 
 root=`pwd`
 troot=$root/tests
@@ -22,9 +22,9 @@ if [ x"$tmp" = x ]; then
        mkdir $tmp
 fi
 cd $tmp
-export HOME=$tmp
 
 tmp=`pwd`
+export HOME=$tmp
 export DGIT_TEST_DUMMY_DIR=$tmp
 ln -f $troot/ssh ssh
 
@@ -41,9 +41,11 @@ 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
+       test ${PIPESTATUS[0]} != 0
+       egrep "$mpat" $tmp/t.output ||false
 }
 
 t-untar () {
@@ -81,7 +83,20 @@ t-has-ancestor () {
        if [ x$mbase != x$ancestor ]; then
                fail "not ff $ancestor..$now, $mbase != $ancestor"
        fi
-}      
+}
+
+t-prep-newpackage () {
+       p=$1
+       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
+       cd ..
+}
 
 t-archive-none () {
        p=$1
@@ -159,7 +174,7 @@ t-dgit () {
        : '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
        $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
-               -dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \
+               -dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
                -k39B13D8A "$@"
        : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
@@ -304,6 +319,16 @@ t-drs () {
  t-git-config dgit-distro.test-dummy.git-create true
        cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
        cp $root/tests/suites $tmp/.
+
+       drs_dispatch=$tmp/distro=test-dummy
+       mkdir $drs_dispatch
+       ln -sf $root $drs_dispatch/dgit-live
+       ln -sf $tmp/git $drs_dispatch/repos
+       ln -sf $tmp/suites $tmp/dm.txt $drs_dispatch/
+       mkdir -p $drs_dispatch/keyrings
+       ln -sf $tmp/dd.gpg $drs_dispatch/keyrings/debian-keyring.gpg
+       ln -sf $tmp/dm.gpg $drs_dispatch/keyrings/debian-maintainers.gpg
+       ln -sf /bin/true $drs_dispatch/policy-hook
 }
 
 t-dsd () {
@@ -320,17 +345,21 @@ t-dsd () {
  t-git-config dgit-distro.test-dummy/drs.git-check ssh-cmd
  t-git-config dgit-distro.test-dummy/drs.git-create ssh-cmd
 
-       dsd_dispatch=$tmp/dispatch-dir/distro=test-dummy
-       mkdir -p $dsd_dispatch
-       ln -sf $root $dsd_dispatch/dgit-live
-       ln -sf $tmp/git $dsd_dispatch/repos
-       ln -sf $tmp/suites $tmp/dm.txt $dsd_dispatch/
-       mkdir -p $dsd_dispatch/keyrings
-       ln -sf $tmp/dd.gpg $dsd_dispatch/keyrings/debian-keyring.gpg
-       ln -sf $tmp/dm.gpg $dsd_dispatch/keyrings/debian-maintainers.gpg
-       ln -sf /bin/true $dsd_dispatch/policy-hook
-
-       echo 'no-such-package* drs' >$dsd_dispatch/diverts
+       echo 'no-such-package* drs' >$drs_dispatch/diverts
+}
+
+t-policy-admin () {
+       ${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
+}
+
+t-debpolicy () {
+       t-dsd
+
+       ln -sf ${DGIT_INFRA_PFX}dgit-repos-policy-debian \
+               $drs_dispatch/policy-hook
+
+       mkdir $tmp/git
+       t-policy-admin create-db
 }
 
 t-chain-test () {