Merge remote-tracking branch 'mvo/feature/dpkg-progress-fancy' into debian/sid

[apt.git] / test / integration / test-apt-get-download

diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download
index 7db93c32fb70767b5d84febd8ca411b3d102a8e6..6eac079f3c9c8d6d7d7f446e4a9f601858d09efd 100755 (executable)
--- a/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@ -9,21 +9,25 @@ configarchitecture "i386"
 
 buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
 buildsimplenativepackage 'apt' 'all' '2.0' 'unstable'
 
 buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
 buildsimplenativepackage 'apt' 'all' '2.0' 'unstable'

+insertinstalledpackage 'vrms' 'all' '1.0'

 
 setupaptarchive
 
 testdownload() {
 
 setupaptarchive
 
 testdownload() {

-       msgtest 'Test download of package file' $1
-       if [ -z "$3" ]; then
-               aptget download ${2}
-       else
-               aptget download ${2}/${3}
+       local APT="$2"
+       if [ -n "$3" ]; then
+               APT="${APT}/${3}"

        fi
        fi

-       test -f $1 && msgpass || msgfail
+       msgtest "Test download of package file $1 with" "$APT"
+       aptget -qq download ${APT} && test -f $1 && msgpass || msgfail
+       rm $1

 }
 
 testdownload apt_1.0_all.deb apt stable
 testdownload apt_2.0_all.deb apt
 
 DEBFILE="$(readlink -f aptarchive)/pool/apt_2.0_all.deb"
 }
 
 testdownload apt_1.0_all.deb apt stable
 testdownload apt_2.0_all.deb apt
 
 DEBFILE="$(readlink -f aptarchive)/pool/apt_2.0_all.deb"

-testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) sha256:$(sha256sum $DEBFILE | cut -d' ' -f 1)" aptget download apt --print-uris
+testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) SHA512:$(sha512sum $DEBFILE | cut -d' ' -f 1)" aptget download apt --print-uris
+
+# deb:677887
+testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms