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
+
root=`pwd`
troot=$root/tests
testname="${DGIT_TEST_TESTNAME-${0##*/}}"
mkdir $tmp
fi
cd $tmp
-export HOME=$tmp
tmp=`pwd`
+export HOME=$tmp
export DGIT_TEST_DUMMY_DIR=$tmp
ln -f $troot/ssh ssh
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 () {
local tarfile=$1.tar
local edittree=$1.edit
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/pool/main/
+ t-archive-query
+}
+
+t-archive-query () {
+ 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/
- echo "$2 $dscf" >>$tmp/aq/package.sid.${p}
+ 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 () {
+ local dgit=${DGIT_TEST-dgit}
: '
-
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
- ${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
- -dtest-dummy $DGIT_TEST_OPTS -D -k39B13D8A "$@"
+ $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
+ -dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \
+ -k39B13D8A "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
'
}
t-diff-nogit () {
- diff --exclude=.git -ruN $*
+ diff --exclude=.git --exclude=.pc -ruN $*
}
t-cloned-fetched-good () {
t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S "
t-git-config dgit-distro.test-dummy.git-check true
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/.
}
-t-drs-test () {
+t-dsd () {
t-drs
+ 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/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"
+ t-git-config dgit-distro.test-dummy/drs.git-url $tmp/git
+ 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
+}
+
+t-chain-test () {
+ local ct=$1
+ local d=${0%/*}
cd $root
export DGIT_TEST_TESTNAME="$testname"
export ADTTMP=$tmp
- cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
- cp $root/tests/suites $tmp/.
- exec "${0///drs-//}" "$@"
+ exec "$d/$ct"
+}
+
+t-alt-test () {
+ local t=${0##*/}
+ t-${t%%-*}
+ t-chain-test "${t#*-}"
}
~ianmdlvl / dgit.git / blobdiff