Test suite: make HOME be an absolute path (!)

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 44f14eede62624b8cec3b2680cc357f06699853b..70cda8f6fefa45d911df58f659da06192542eb0d 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -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
 
@@ -81,34 +81,90 @@ 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
-       mkdir -p $tmp/aq $tmp/mirror
-       echo sid >$tmp/aq/suite.unstable
+       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
+
+       ln -s sid $tmp/aq/dsc_in_suite/unstable
+       cat <<'END' >$tmp/aq/suites
+[
+   {
+      "archive" : "ftp-master",
+      "codename" : "sid",
+      "components" : [
+         "main",
+         "contrib",
+         "non-free"
+      ],
+      "name" : "unstable",
+      "dakname" : "unstable"
+   }
+]
+END
+}
+
+t-archive-updated () {
+       local suite=$1
+       local p=$2
+       perl <$tmp/aq/package.$suite.$p >$tmp/aq/dsc_in_suite/$suite/$p -wne '
+               use JSON;
+               use strict;
+               our @v;
+               m{^(\S+) (\w+) ([^ \t/]+)/(\S+)} or die;
+               push @v, {
+                       "version" => "$1",
+                       "sha256sum" => "$2",
+                       "component" => "$3",
+                       "filename" => "$4",
+               };
+               END {
+                       print to_json \@v or die $!;
+               }
+       '
 }
 
 t-archive-process-incoming () {
-       mv incoming/${p}_${v}[._]* mirror/
+       mv incoming/${p}_${v}[._]* mirror/pool/main/
        t-archive-query
 }
 
 t-archive-query () {
-       local dscf=${p}_${v}.dsc
-       echo "${v} $dscf" >>$tmp/aq/package.sid.${p}
+       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
 }
 
 t-archive () {
        t-archive-none $1
        v=$2
        local dscf=${p}_$2.dsc
-       rm -f $tmp/mirror/${p}_*
-       ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/
+       rm -f $tmp/mirror/pool/main/${p}_*
+       ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
        t-archive-query
        rm -rf $tmp/extract
        mkdir $tmp/extract
-       (set -e; cd $tmp/extract; dpkg-source -x ../mirror/$dscf)
+       (set -e; cd $tmp/extract; dpkg-source -x ../mirror/pool/main/$dscf)
 }
 
 t-dgit () {
@@ -263,13 +319,13 @@ t-drs () {
        cp $root/tests/suites $tmp/.
 }
 
-t-dss () {
+t-dsd () {
        t-drs
- t-git-config dgit-distro.test-dummy.ssh "$troot/dss-ssh"
+ t-git-config dgit-distro.test-dummy.ssh "$troot/dsd-ssh"
  t-git-config dgit-distro.test-dummy.git-check ssh-cmd
  t-git-config dgit-distro.test-dummy.git-create true
  t-git-config dgit-distro.test-dummy.git-url \
-               "ext::$troot/dss-ssh X %S /dgit/test-dummy/repos"
+               "ext::$troot/dsd-ssh X %S /dgit/test-dummy/repos"
 
  t-git-config dgit-distro.test-dummy.diverts.drs /drs
  t-git-config dgit-distro.test-dummy/drs.ssh "$troot/ssh"
@@ -277,17 +333,17 @@ t-dss () {
  t-git-config dgit-distro.test-dummy/drs.git-check ssh-cmd
  t-git-config dgit-distro.test-dummy/drs.git-create ssh-cmd
 
-       dss_dispatch=$tmp/dispatch-dir/distro=test-dummy
-       mkdir -p $dss_dispatch
-       ln -sf $root $dss_dispatch/dgit-live
-       ln -sf $tmp/git $dss_dispatch/repos
-       ln -sf $tmp/suites $tmp/dm.txt $dss_dispatch/
-       mkdir -p $dss_dispatch/keyrings
-       ln -sf $tmp/dd.gpg $dss_dispatch/keyrings/debian-keyring.gpg
-       ln -sf $tmp/dm.gpg $dss_dispatch/keyrings/debian-maintainers.gpg
-       ln -sf /bin/true $dss_dispatch/policy-hook
-
-       echo 'no-such-package* drs' >$dss_dispatch/diverts
+       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
 }
 
 t-chain-test () {