set -o pipefail
. tests/lib-core
+. tests/lib-restricts
t-set-intree
-: ${DGIT_TEST_DEBUG:=-D}
+: ${DGIT_TEST_DEBUG=-D}
export DGIT_TEST_DEBUG
+export GIT_COMMITTER_DATE='1440253867 +0100'
+export GIT_AUTHOR_DATE='1440253867 +0100'
+
root=`pwd`
troot=$root/tests
testname="${DGIT_TEST_TESTNAME-${0##*/}}"
run_dinstall = 0
END
+t-git-next-date () {
+ GIT_COMMITTER_DATE="$(( ${GIT_COMMITTER_DATE%% *} + 1 )) ${GIT_COMMITTER_DATE#* }"
+ GIT_AUTHOR_DATE="$GIT_COMMITTER_DATE"
+}
+
t-expect-fail () {
local mpat="$1"; shift
+ set +o pipefail
+ LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
+ local ps="${PIPESTATUS[*]}"
+ set -o pipefail
+
+ case $ps in
+ "0 0") fail "command unexpectedly succeeded (instead of: $mpat)" ;;
+ *" 0") ;;
+ *) fail "tee failed" ;;
+ esac
+
+ t-grep-mpat "$mpat" $tmp/t.output
+}
+
+t-grep-mpat () {
+ local mpat="$1"
+ local file="$2"
+
local grepper=fgrep
case "$mpat" in
[A-Z]:*)
;;
esac
- set +o pipefail
- LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
- local ps="${PIPESTATUS[*]}"
- set -o pipefail
-
- case $ps in
- "0 0") fail "command unexpectedly succeeded (instead of: $mpat)" ;;
- *" 0") ;;
- *) fail "tee failed" ;;
- esac
-
- $grepper -e "$mpat" $tmp/t.output ||
- fail "error message not found"
+ $grepper -e "$mpat" "$file" ||
+ fail "message not found"
}
t-expect-push-fail () {
t-git-objects-not-present () {
# t-git-objects-not-present GITDIR|'' OBJID [...]
# specifying '' means the repo for package $p
- local gitdir="${1-$tmp/git/$p.git}"
+ local gitdir="${1-$dgitrepo}"
local obj
if ! [ -e "$gitdir" ]; then return; fi
for obj in "$@"; do
t-reporefs () {
local whichoutput=$1; shift
+ local whichrepo=${1-$dgitrepo}
local outputfile="$tmp/show-refs.$whichoutput"
(set -e
exec >"$outputfile"
- if test -d $tmp/git/$p.git; then
- cd $tmp/git/$p.git
+ if test -d $whichrepo; then
+ cd $whichrepo
git show-ref |sort
fi)
}
local tarfile=$1.tar
local edittree=$1.edit
if test -d "$edittree"; then
- cp -al "$edittree"/* .
+ cp -a "$edittree"/* .
else
tar xf "$tarfile"
fi
t-untar $troot/worktrees/${p}_$1
}
-t-git () {
+t-select-package () {
p=$1
+ dgitrepo=$tmp/git/$p.git
+}
+
+t-git () {
+ t-select-package $1
v=$2
mkdir -p $tmp/git
local gs=$troot/git-srcs/${p}_$v.git
(set -e; cd $tmp/git; tar xf $troot/git-template.tar)
}
+t-git-merge-base () {
+ git merge-base $1 $2 || test $? = 1
+}
+
t-has-ancestor () {
local now=`git rev-parse HEAD`
local ancestor=`git rev-parse $1^{}`
- local mbase=`git merge-base $ancestor $now`
+ local mbase=`t-git-merge-base $ancestor $now`
if [ x$mbase != x$ancestor ]; then
fail "not ff $ancestor..$now, $mbase != $ancestor"
fi
}
t-prep-newpackage () {
- p=$1
+ t-select-package $1
v=$2
t-archive-none $p
t-git-none
}
t-archive-none () {
- p=$1
+ t-select-package $1
mkdir -p $tmp/aq $tmp/mirror/pool/main
local suite=sid
}
t-git-dir-time-passes () {
- touch -d 'last year' $tmp/git/$p.git
+ touch -d 'last year' $dgitrepo
}
t-git-dir-check () {
- local gitdir=$tmp/git/$p.git
+ local gitdir=$dgitrepo
case "$1" in
enoent)
if test -e "$gitdir"; then fail "$gitdir exists"; fi
t-dgit () {
local dgit=${DGIT_TEST-dgit}
+ pwd
: '
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
diff --exclude=.git --exclude=.pc -ruN $*
}
+t-files-notexist () {
+ local f
+ for f in "$@"; do
+ if [ -e $f ]; then
+ fail "$f exists!"
+ fi
+ done
+}
+
t-cloned-fetched-good () {
t-diff-nogit ../extract/$p-${v%-*} .
t-clean-on-branch dgit/sid
'
}
+t-ref-same-exact () {
+ local name="$1"
+ local 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`
t-refs-notexist () {
local val
for g in $*; do
- val=`t-git-get-ref $g >$tmp/t.refx`
+ val=`t-git-get-ref $g`
if [ "x$val" != x ]; then
fail "ref $g unexpectedly exists ($val)"
fi
}
t-v-tag () {
- echo refs/tags/debian/${v//\~/_}
+ echo refs/tags/test-dummy/${v//\~/_}
+}
+
+t-check-pushed-master () {
+ local 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`
+ if [ x$mbase = x$master ]; then fail "failed to ff master"; fi
}
t-pushed-good () {
t-refs-notexist \
refs/heads/dgit/unstable \
refs/remotes/dgit/dgit/unstable
- (set -e; cd $tmp/git/$p.git
+ (set -e; cd $dgitrepo
t-refs-same \
refs/dgit/sid \
`t-v-tag`
+ ${t_check_pushed_master:- : NOT-DRS-NO-CHECK-PUSHED-MASTER}
t-refs-notexist \
refs/dgit/unstable
)
git verify-tag `t-v-tag`
}
+t-commit-build-push-expect-log () {
+ local msg=$1
+ local mpat=$2
+ t-commit "$msg"
+ t-dgit build
+ LC_MESSAGES=C \
+ t-dgit push --new 2>&1 |tee $tmp/push.log
+ t-grep-mpat "$mpat" $tmp/push.log
+}
+
t-822-field () {
local file=$1
local field=$2
t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
}
-t-prep-mergechangelogs () {
- local b=merge.dpkg-mergechangelogs
- git config $b.name 'debian/changelog merge driver'
- git config $b.driver 'dpkg-mergechangelogs -m %O %A %B %A'
- mkdir -p .git/info
- echo >>.git/info/attributes \
- 'debian/changelog merge=dpkg-mergechangelogs'
-}
-
t-ref-dsc-dgit () {
local dsc=${p}_${v}.dsc
local val=`t-822-field $tmp/incoming/$dsc Dgit`
| patch -p1 -u
}
+t-gbp-unapplied-pq2qc () {
+ # does `gbp pq export' (leaving us on BRANCH (eg "quilt-tip"))
+ # commits the resulting debian/patches on qc/BRANCH
+ # goes back to patch-queue/BRANCH
+ # qc/BRANCH is not fast-forwarding
+
+ gbp pq export
+
+ branch=`git symbolic-ref HEAD`
+ branch=${branch#refs/heads/}
+
+ case "$branch" in
+ */*) fail "unexpected branch $branch" ;;
+ esac
+
+ git branch -f qc/$branch
+ git checkout qc/$branch
+ git add debian/patches
+ git commit -m 'Commit patch queue'
+ git checkout patch-queue/$branch
+}
+
t-commit () {
local msg=$1
- v=1.$revision
+ v=${2-1.$revision}
dch -v$v --distribution unstable "$1"
git add debian/changelog
debcommit
- revision=$(( $revision + 1 ))
+ revision=$(( ${revision-0} + 1 ))
}
t-git-config () {
t-git-config dgit-distro.test-dummy.git-create true
cp $troot/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
cp $troot/suites $tmp/.
+ cp $troot/suites $tmp/suites-master
+
+ export t_check_pushed_master=t-check-pushed-master
drs_dispatch=$tmp/distro=test-dummy
mkdir $drs_dispatch
fi
ln -sf $tmp/git $drs_dispatch/repos
- ln -sf $tmp/suites $tmp/dm.txt $drs_dispatch/
+ ln -sf $tmp/suites $tmp/suites-master $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
${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
}
-t-policy () {
- local policyhook=$1
- policyhook=${DGIT_INFRA_PFX}$policyhook
- case $policyhook in
+t-policy-nonexist () {
+ ln -sf no-such-file-or-directory $drs_dispatch/policy-hook
+}
+
+t-make-hook-link () {
+ local hook=$1 # in infra/
+ local linkpath=$2
+ hook=${DGIT_INFRA_PFX}$hook
+ case $hook in
*/*) ;;
- *) policyhook=`type -P $policyhook` ;;
+ *) hook=`type -P $hook` ;;
esac
- ln -sf "$policyhook" $drs_dispatch/policy-hook
+ ln -sf "$hook" $linkpath
+}
+
+t-policy () {
+ local policyhook=$1
+ t-make-hook-link $policyhook $drs_dispatch/policy-hook
}
t-debpolicy () {
test-dummy $drs_dispatch '' --cron
}
+t-restrict () {
+ local restriction=$1
+ (cd $root; t-restriction-$restriction >&2)
+}
+
+t-dependencies () {
+ : "Hopefully installed: $*"
+}
+
t-chain-test () {
local ct=$1
local d=${0%/*}
~ianmdlvl / dgit.git / blobdiff