X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=dd8c4d0152ac08cc51ab260e5187bce072ab7c0f;hb=4cb451aa46ad449116f9ff0d1a4450e6dcc01d4f;hp=277ad5e33df189c6b903c8378c3ad1e638a1ce30;hpb=625519607d0e5552d0e0372fc833e9def2f219c5;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 277ad5e3..dd8c4d01 100644
--- a/tests/lib
+++ b/tests/lib
@@ -189,6 +189,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
 }
@@ -360,7 +367,7 @@ t-expect-fsck-fail () {
 }
 
 t-git-fsck () {
-	local fsckerrs=dgit-test-fsck.errs
+	local fsckerrs=$(git rev-parse --git-dir)/dgit-test-fsck.errs
 
 	set +e
 	LC_MESSAGES=C git fsck --no-dangling --strict 2>&1 \
@@ -417,7 +424,7 @@ t-dgit () {
  ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \
 		${distro+${distro:+-d}}${distro--dtest-dummy} \
 		$DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
-		-k39B13D8A $t_dgit_xopts "$@"
+		-kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $t_dgit_xopts "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
@@ -635,6 +642,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}
@@ -982,6 +1004,11 @@ t-commit () {
 	revision=$(( ${revision-0} + 1 ))
 }
 
+t-dch-commit () {
+	dch "$@"
+	git commit -m "dch $*" debian/changelog
+}
+
 t-git-config () {
 	git config --global "$@"
 }