autopkgtests: do fetch of new version too

1 files changed, 21 insertions, 9 deletions

diff --git a/tests/lib b/tests/lib
index baf3e46..5ce17d6 100644
--- a/tests/lib
+++ b/tests/lib
@@ -1,6 +1,7 @@
 #
 
 exec 2>&1
+set -x
 
 root=`pwd`
 troot=$root/tests
@@ -22,33 +23,44 @@ mkdir $tmp/gnupg
 export GNUPGHOME=$tmp/gnupg
 
 t-git () {
-	mkdir -p git
+	mkdir -p $tmp/git
 	cp -al $troot/git-srcs/$1 git/.
 }
 
 t-git-none () {
-	mkdir -p git
+	mkdir -p $tmp/git
 }
 
 t-archive () {
 	p=$1
-	mkdir -p aq mirror
+	v=$2
+	mkdir -p $tmp/aq $tmp/mirror
 	local dscf=${p}_$2.dsc
-	ln $troot/pkg-srcs/${p}_${2%-*}* mirror/
-	echo sid >aq/suite.unstable
-	echo "$2 $dscf" >>aq/package.sid.${p}
-	mkdir extract
-	(set -e; cd extract; dpkg-source -x ../mirror/$dscf)
+	rm -f $tmp/mirror/${p}_*
+	ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/
+	echo sid >$tmp/aq/suite.unstable
+	echo "$2 $dscf" >>$tmp/aq/package.sid.${p}
+	rm -rf $tmp/extract
+	mkdir $tmp/extract
+	(set -e; cd $tmp/extract; dpkg-source -x ../mirror/$dscf)
 }
 
 t-dgit () {
-	${DGIT_TEST-dgit} --dget:-u -dtest-dummy "$@"
+	: '{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
+	${DGIT_TEST-dgit} --dget:-u -dtest-dummy -D "$@"
+	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
 }
 
 t-diff-nogit () {
 	diff --exclude=.git -ruN $*
 }
 
+t-cloned-fetched-good () {
+	t-diff-nogit ../extract/$p-${v%-*} .
+	t-clean-on-branch dgit/sid
+	t-refs-same HEAD remotes/dgit/dgit/sid
+}
+
 t-output () {
 	printf "%s\n" "$1" >$tmp/t.want
 	shift