X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=bad47c90de92c9549a300b8e2aa23e04cf91a476;hp=4f268fc6a389b2dc5515fd976dba7597e7d02804;hb=38eae0db7f393311667bec9dfe0aa7a514b893bd;hpb=090071ae8e31c8f81283af477c1114835ed8fd02

diff --git a/tests/lib b/tests/lib
index 4f268fc6..bad47c90 100644
--- a/tests/lib
+++ b/tests/lib
@@ -31,15 +31,17 @@ export DGIT_TEST_DEBUG
 
 : ${DGIT_TEST_DISTRO+ ${distro=${DGIT_TEST_DISTRO}}}
 
-export GIT_COMMITTER_DATE='1440253867 +0100'
-export GIT_AUTHOR_DATE='1440253867 +0100'
+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
+	export DGIT_TEST_BYHAND=1
 	mkdir -p tests/tmp
 	tmpbase=$troot/tmp
 	tmp=tests/tmp/$testname
@@ -188,6 +190,13 @@ t-git-none () {
 	(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
 }
@@ -359,9 +368,11 @@ t-expect-fsck-fail () {
 }
 
 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 dgit-test-fsck.errs
+		| tee $fsckerrs
 	ps="${PIPESTATUS[*]}"
 	set -e
 
@@ -375,7 +386,7 @@ t-git-fsck () {
 	pats+=(-e 'notice: No default references')
 
 	set +e
-	grep -v "${pats[@]}" dgit-test-fsck.errs
+	grep -v "${pats[@]}" $fsckerrs
 	rc=$?
 	set -e
 	case $rc in
@@ -407,18 +418,30 @@ t-rm-dput-dropping () {
 
 t-dgit () {
 	local dgit=${DGIT_TEST-dgit}
-	pwd
+	pwd >&2
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
  ${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 \
-		-k39B13D8A $t_dgit_xopts "$@"
+		-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 $*
 }
@@ -458,12 +481,12 @@ t-setup-done () {
 	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
@@ -621,6 +644,21 @@ t-check-pushed-master () {
 	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}
@@ -968,12 +1006,16 @@ t-commit () {
 	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
@@ -1093,7 +1135,11 @@ t-alt-test () {
 
 t-git-config dgit.default.old-dsc-distro test-dummy
 
-case "$0" in
-*/gnupg) ;;
-*)	t-setup-import gnupg	;;
-esac
+for import in ${autoimport-gnupg}; do
+	case "$0" in
+	*/$import) ;;
+	*)
+		t-setup-import $import
+		;;
+	esac
+done