X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=3c31a29cb11ff689128bb791d563002cf48f9bd3;hp=34281898f1def77f8b07cf730c2eea4dc444b1cc;hb=e3a629cbad9501d8e92b7ed04f7c545583c8550b;hpb=68fecefcb822012c8eaef19c4368a674111df509

diff --git a/tests/lib b/tests/lib
index 34281898..3c31a29c 100644
--- a/tests/lib
+++ b/tests/lib
@@ -90,11 +90,12 @@ t-prep-newpackage () {
 	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
+	if ! git-show-ref --verify --quiet refs/heads/master; then
+		git branch -m dgit/sid master
+		git remote rm dgit
+	fi
 	cd ..
 }
 
@@ -151,15 +152,17 @@ t-archive-updated () {
 }
 
 t-archive-process-incoming () {
-	mv incoming/${p}_${v}[._]* mirror/pool/main/
-	t-archive-query
+	local suite=$1
+	mv $tmp/incoming/${p}_${v}[._]* $tmp/mirror/pool/main/
+	t-archive-query "$suite"
 }
 
 t-archive-query () {
+	local suite=${1-sid}
 	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
+	local sha=`sha256sum <$tmp/mirror/pool/$dscf`
+	echo "${v} ${sha%  -} $dscf" >>$tmp/aq/package.$suite.${p}
+	t-archive-updated $suite $p
 }
 
 t-archive () {
@@ -174,6 +177,28 @@ t-archive () {
 	(set -e; cd $tmp/extract; dpkg-source -x ../mirror/pool/main/$dscf)
 }
 
+t-git-dir-time-passes () {
+	touch -d 'last year' $tmp/git/$p.git
+}
+
+t-git-dir-check () {
+	local gitdir=$tmp/git/$p.git
+	case "$1" in
+	enoent)
+		if test -e "$gitdir"; then fail "$gitdir exists"; fi
+		return
+		;;
+	public) wantstat='7[75]5' ;;
+	secret)	wantstat='7[70]0' ;;
+	*)	fail "$1 t-git-dir-check ?" ;;
+	esac
+	gotstat=`stat -c%a $gitdir`
+	case "$gotstat" in
+	*$wantstat) return ;;
+	*)	fail "$gitdir has mode $gotstat, expected $wantstat" ;;
+	esac
+}
+
 t-dgit () {
 	local dgit=${DGIT_TEST-dgit}
 	: '
@@ -367,6 +392,11 @@ t-debpolicy () {
 	t-policy-admin create-db
 }
 
+t-policy-periodic () {
+	${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
+		test-dummy $drs_dispatch '' --cron
+}
+
 t-chain-test () {
 	local ct=$1
 	local d=${0%/*}