rc=$1
cat <<END >&2
TEST FAILED
+cwd: $PWD
funcs: ${FUNCNAME[*]}
lines: ${BASH_LINENO[*]}
files: ${BASH_SOURCE[*]}
: ${DGIT_TEST_DEBUG=-D}
export DGIT_TEST_DEBUG
-export GIT_COMMITTER_DATE='1440253867 +0100'
-export GIT_AUTHOR_DATE='1440253867 +0100'
+: ${DGIT_TEST_DISTRO+ ${distro=${DGIT_TEST_DISTRO}}}
+
+export GIT_COMMITTER_DATE='1515000000 +0100'
+export GIT_AUTHOR_DATE='1515000000 +0100'
root=`pwd`
troot=$root/tests
testname="${DGIT_TEST_TESTNAME-${0##*/}}"
+export DGIT_TEST_TROOT=$troot
tmp=$ADTTMP
if [ x"$tmp" = x ]; then
t-set-using-tmp
+test -f $tmp/.save-env || \
env -0 >$tmp/.save-env
ln -f $troot/ssh ssh
run_dinstall = 0
END
+: ${t_archive_method:=aq}
: ${tagpfx:=archive/test-dummy}
: ${suitespecs:=sid:unstable}
t-expect-push-fail () {
local mpat="$1"; shift
- local triedpush=`git rev-parse HEAD`
+ local triedpush; triedpush=`git rev-parse HEAD`
t-reporefs pre-push
t-expect-fail "$mpat" "$@"
(set -e; cd $tmp/git; tar xf $troot/git-template.tar)
}
+t-salsa-add-remote () {
+ local d=$tmp/salsa/$p
+ mkdir -p $d
+ (set -e; cd $d; git init --bare)
+ git remote add ${1-origin} $d
+}
+
t-git-merge-base () {
git merge-base $1 $2 || test $? = 1
}
t-has-ancestor () {
# t-has-ancestor ANCESTOR
# (CHILD is implicit, HEAD)
- local now=`git rev-parse HEAD`
- local ancestor=`git rev-parse $1^{}`
- local mbase=`t-git-merge-base $ancestor $now`
+ local now; now=`git rev-parse HEAD`
+ local ancestor; ancestor=`git rev-parse $1^{}`
+ local mbase; mbase=`t-git-merge-base $ancestor $now`
if [ x$mbase != x$ancestor ]; then
fail "not ff $ancestor..$now, $mbase != $ancestor"
fi
}
-t-has-parent () {
- # t-has-parent CHILD PARENT
+t-has-parent-or-is () {
+ # t-has-parent-or-is CHILD PARENT
local child=$1
local parent=$2
- local parents=$(git show --pretty=format:' %P ' "$child")
+ local parents
+ parents=$(git show --pretty=format:' %P %H ' "$child")
parent=$(git rev-parse "$parent~0")
case "$parents" in
*" $parent "*) ;;
t-archive-none () {
t-select-package $1
+ t-archive-none-$t_archive_method
+}
+t-archive-none-aq () {
mkdir -p $tmp/aq/dsc_in_suite $tmp/mirror/pool/main
: >$tmp/aq/suites
local sname=${suitespec#*:}
>$tmp/aq/package.$suite.$p
- t-archive-updated $suite $p
+ t-aq-archive-updated $suite $p
>$tmp/aq/package.new.$p
- t-archive-updated new $p
+ t-aq-archive-updated new $p
ln -sf $suite $tmp/aq/dsc_in_suite/$sname
END
}
-t-archive-updated () {
+t-aq-archive-updated () {
local suite=$1
local p=$2
local suitedir=$tmp/aq/dsc_in_suite/$suite
t-archive-query () {
local suite=${1-sid}
local dscf=main/${p}_${v}.dsc
- local sha=`sha256sum <$tmp/mirror/pool/$dscf`
+ t-archive-query-$t_archive_method "$suite" "$p" "$v" "$dscf"
+}
+t-archive-query-aq () {
+ local suite=$1
+ local p=$2
+ local v=$3
+ local dscf=$4
+ local sha; sha=`sha256sum <$tmp/mirror/pool/$dscf`
echo "${v} ${sha% -} $dscf" >>$tmp/aq/package.$suite.${p}
- t-archive-updated $suite $p
+ t-aq-archive-updated $suite $p
}
t-archive () {
local dscf=${p}_$2.dsc
rm -f $tmp/mirror/pool/main/${p}_*
ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
- t-archive-query
+ t-archive-query $suite
rm -rf $tmp/extract
mkdir $tmp/extract
(set -e; cd $tmp/extract; dpkg-source -x ../mirror/pool/main/$dscf)
esac
}
+t-expect-fsck-fail () {
+ echo >>$tmp/fsck.expected-errors "$1"
+}
+
+t-git-fsck () {
+ local fsckerrs=$(git rev-parse --git-dir)/dgit-test-fsck.errs
+
+ set +e
+ LC_MESSAGES=C git fsck --no-dangling --strict 2>&1 \
+ | tee $fsckerrs
+ ps="${PIPESTATUS[*]}"
+ set -e
+
+ local pats
+ if [ -f $tmp/fsck.expected-errors ]; then
+ pats=(-w -f $tmp/fsck.expected-errors)
+ else
+ test "$ps" = "0 0"
+ fi
+ pats+=(-e 'notice: HEAD points to an unborn branch')
+ pats+=(-e 'notice: No default references')
+
+ set +e
+ grep -v "${pats[@]}" $fsckerrs
+ rc=$?
+ set -e
+ case $rc in
+ 1) ;; # no unexpected errors
+ 0) fail "unexpected messages from git-fsck" ;;
+ *) fail "grep of git-fsck failed" ;;
+ esac
+}
+
+t-fscks () {
+ (
+ shopt -s nullglob
+ for d in $tmp/*/.git $tmp/git/*.git; do
+ cd "${d%/.git}"
+ t-git-fsck
+ done
+ )
+}
+
+t-ok () {
+ : '========================================'
+ t-fscks
+ echo ok.
+}
+
t-rm-dput-dropping () {
rm -f $tmp/${p}_${v}_*.upload
}
t-dgit () {
local dgit=${DGIT_TEST-dgit}
- pwd
+ pwd >&2
: '
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
- -dtest-dummy $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
- -k39B13D8A $t_dgit_xopts "$@"
+ ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \
+ ${DGIT_GITDEBREBASE_TEST+--git-debrebase=}${DGIT_GITDEBREBASE_TEST} \
+ ${distro+${distro:+-d}}${distro--dtest-dummy} \
+ $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
+ -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $t_dgit_xopts "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
'
}
+t-dgit-manpage () {
+ local section=$1
+ local page=$2
+ (export LC_ALL=C.UTF-8
+ if [ "$DGIT_TEST_INTREE" ]; then
+ make -C $DGIT_TEST_INTREE $page.$section.view
+ else
+ man $section $page
+ fi)
+}
+
t-diff-nogit () {
diff --exclude=.git --exclude=.pc -ruN $*
}
local savedirs=$2
local importeval=$3
- local import=IMPORT.${0##*/}
+ local import=IMPORT.${DGIT_TEST_TESTNAME-${0##*/}}
exec 4>$tmp/$import.new
local vn
for vn in $savevars; do
- perl >&4 -I. -MDebian::Dgit -e '
+ perl >&4 -"I$root" -MDebian::Dgit -e '
printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1]
' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
done
t-ref-same-exact () {
local name="$1"
- local val=`t-git-get-ref-exact $name`
+ local val; val=`t-git-get-ref-exact $name`
t-ref-same-val "$name" $val
}
t-ref-same () {
local name="$1"
- local val=`t-git-get-ref $name`
+ local val; val=`t-git-get-ref $name`
t-ref-same-val "$name" $val
}
t-ref-head () {
- local val=`git rev-parse HEAD`
+ local val; val=`git rev-parse HEAD`
t-ref-same-val HEAD $val
}
t-sametree-parent () {
local ref=$1
local parent
- local ctree=$(t-format-ref '%T' "$ref")
+ local ctree; ctree=$(t-format-ref '%T' "$ref")
while :; do
local psame=''
for parent in $(t-format-ref '%P' "$ref"); do
- local ptree=$(t-format-ref '%T' "$parent")
+ local ptree; ptree=$(t-format-ref '%T' "$parent")
if [ "x$ptree" = "x$ctree" ]; then
psame+=" $parent"
fi
}
t-check-pushed-master () {
- local master=`t-git-get-ref refs/heads/master`
+ local master; master=`t-git-get-ref refs/heads/master`
if [ x$master = x$t_ref_val ]; then return; fi
if [ x$master = x ]; then fail "failed to push master"; fi
# didn't update master, it must be not FF
- local mbase=`t-git-merge-base $master $t_ref_val`
+ local mbase; mbase=`t-git-merge-base $master $t_ref_val`
if [ x$mbase = x$master ]; then fail "failed to ff master"; fi
}
+t-push-was-source-only () {
+ local f
+ t-files-notexist $tmp/incoming/${p}_${v}_*.deb \
+ $tmp/incoming/${p}_${v}_*.udeb
+ # we permit _source.buildinfo files; see test_changes_source_only()
+ for f in $tmp/incoming/${p}_${v}_*.buildinfo; do
+ if [ -e $f ]; then
+ case "$f" in
+ *_source.buildinfo) ;;
+ *) fail "non-source-only file $f exists!" ;;
+ esac
+ fi
+ done
+}
+
t-pushed-good () {
local branch=$1
local suite=${2:-sid}
mkdir t-unpack
cd t-unpack
ln -s $tmp/mirror/pool/main/*.orig*.tar* .
+ ln -s $tmp/incoming/*.orig*.tar* . ||:
ln -s $incoming_dsc .
ln -s ${incoming_dsc/.dsc/.debian.tar}* .
dpkg-source "$@" -x *.dsc
' <$file
}
+t-defdistro () {
+ export DGIT_TEST_DISTRO=''
+ distro=''
+ t-git-config dgit-suite.unstable.distro test-dummy
+}
+
t-stunt-envvar () {
local var=$1
local tstunt=$2
'
}
+t-tstunt--save-real () {
+ local f="$1"
+ case "$f" in
+ */*) return ;;
+ esac
+
+ local rc
+ local real
+ set +e
+ real=$(
+ p=":$PATH:"
+ p="${p/:"$tmp/tstunt":/:}"
+ p="${p%:}"
+ p="${p#:}"
+ PATH="$p"
+ type -p "$f"
+ )
+ rc=$?
+ set -e
+
+ case $rc in
+ 1) return ;;
+ 0) ;;
+ *) fail "did not find $f on PATH $PATH" ;;
+ esac
+
+ local varname=${f//[^_0-9a-zA-Z]/_}
+ varname=DGIT_TEST_REAL_${varname^^}
+
+ eval "
+ : \${$varname:=\$real}
+ export $varname
+ "
+}
+
t-tstunt () {
local tstunt=$tmp/tstunt
t-stunt-envvar PATH $tstunt
t-stunt-envvar PERLLIB $tstunt
local f
for f in "$@"; do
+ t-tstunt--save-real $f
f="./$f"
local d="$tstunt/${f%/*}"
mkdir -p $d
t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
}
+t-tstunt-lintian () {
+ t-tstunt lintian
+}
+
+t-tstunt-debuild () {
+ t-tstunt debuild
+}
+
t-incoming-dsc () {
local dsc=${p}_${v}.dsc
incoming_dsc=$tmp/incoming/$dsc
t-ref-dsc-dgit () {
t-incoming-dsc
- local val=`t-822-field $incoming_dsc Dgit`
- perl -e '$_=shift @ARGV; die "Dgit $_ ?" unless m/^\w+\b/;' "$val"
+ local val; val=`t-822-field $incoming_dsc Dgit`
+ val=$( perl -e '
+ $_=shift @ARGV;
+ die "Dgit $_ ?" unless m/^\w+\b/;
+ print $&,"\n" or die $!;
+ ' "$val")
t-ref-same-val $incoming_dsc "$val"
}
remotes/dgit/dgit/sid
}
+t-make-badcommit () {
+ badcommit=$(
+ git cat-file commit HEAD | \
+ perl -pe 's/^committer /commiter /' | \
+ git hash-object -w -t commit --stdin
+ )
+ t-expect-fsck-fail $badcommit
+}
+
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
- dch -v$v --distribution ${3:-unstable} "$1"
+ dch --force-distribution -v$v --distribution ${3:-unstable} "$1"
git add debian/changelog
debcommit
revision=$(( ${revision-0} + 1 ))
}
+t-dch-commit () {
+ faketime @"${GIT_AUTHOR_DATE% *}" dch "$@"
+ git commit -m "dch $*" debian/changelog
+}
+
t-git-config () {
git config --global "$@"
}
t-drs () {
- export DGIT_TEST_TROOT=$troot
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
}
t-policy-admin () {
+ : '(((((((((((((((((((((((((((((((((((((((('
${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
+ : '))))))))))))))))))))))))))))))))))))))))'
}
t-policy-nonexist () {
}
t-policy-periodic () {
+ : '(((((((((((((((((((((((((((((((((((((((('
${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
test-dummy $drs_dispatch '' --cron
+ : '))))))))))))))))))))))))))))))))))))))))'
}
t-restrict () {
t-chain-test "${t#*-}"
}
-case "$0" in
-*/gnupg) ;;
-*) t-setup-import gnupg ;;
-esac
+t-git-config dgit.default.old-dsc-distro test-dummy
+
+for import in ${autoimport-gnupg}; do
+ case "$0" in
+ */$import) ;;
+ *)
+ t-setup-import $import
+ ;;
+ esac
+done
~ianmdlvl / dgit.git / blobdiff