From c3e8b7bd35221eec4532af528e134164eb612d29 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Nov 2013 14:52:57 +0000 Subject: [PATCH] autopkgtests: do fetch of new version too --- tests/lib | 30 +++++++++++++------ tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz | Bin 0 -> 2484 bytes tests/pkg-srcs/pari-extra_3-2~dummy1.dsc | 19 ++++++++++++ tests/tests/clone-nogit | 9 ++++-- 4 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz create mode 100644 tests/pkg-srcs/pari-extra_3-2~dummy1.dsc diff --git a/tests/lib b/tests/lib index baf3e462..5ce17d6c 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 diff --git a/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz b/tests/pkg-srcs/pari-extra_3-2~dummy1.diff.gz new file mode 100644 index 0000000000000000000000000000000000000000..f5dff2b7992527bbb520d0cef0f7ff5cfab57fc7 GIT binary patch literal 2484 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 literal 0 HcmV?d00001 diff --git a/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc b/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc new file mode 100644 index 00000000..1042f090 --- /dev/null +++ b/tests/pkg-srcs/pari-extra_3-2~dummy1.dsc @@ -0,0 +1,19 @@ +Format: 1.0 +Source: pari-extra +Binary: pari-extra +Architecture: all +Version: 3-2~dummy1 +Maintainer: Bill Allombert +Standards-Version: 3.9.2.0 +Build-Depends: debhelper (>= 5), package-does-not-exist +Package-List: + pari-extra deb math optional +Checksums-Sha1: + ff281e103ab11681324b0c694dd3514d78436c51 121 pari-extra_3.orig.tar.gz + 810c43d186ad2552d65949acf4a065fcfc823636 2484 pari-extra_3-2~dummy1.diff.gz +Checksums-Sha256: + ac1ef39f9da80b582d1c0b2adfb09b041e3860ed20ddcf57a0e922e3305239df 121 pari-extra_3.orig.tar.gz + 41f47f24df7f50555f43549bd8377cce046750d29f69903e04b7fbfe396a0a73 2484 pari-extra_3-2~dummy1.diff.gz +Files: + 76bcf03be979d3331f9051aa88439b8b 121 pari-extra_3.orig.tar.gz + eff09e2ace409a150646c4994f17f800 2484 pari-extra_3-2~dummy1.diff.gz diff --git a/tests/tests/clone-nogit b/tests/tests/clone-nogit index d73b826b..709aa1fa 100755 --- a/tests/tests/clone-nogit +++ b/tests/tests/clone-nogit @@ -7,9 +7,12 @@ t-archive pari-extra 3-1 t-dgit clone $p -t-diff-nogit extract/$p-3 $p cd $p -t-clean-on-branch dgit/sid -t-refs-same HEAD remotes/dgit/dgit/sid +t-cloned-fetched-good + +t-archive pari-extra 3-2~dummy1 + +t-dgit pull +t-cloned-fetched-good echo ok -- 2.30.2