merge with my debian-sid branch

[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..4edb7c173f1d8fbf13e0649e95006c2014d4beb2 100755 (executable)
--- a/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@ -13,13 +13,12 @@ buildsimplenativepackage 'apt' 'all' '2.0' 'unstable'
 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
-       test -f $1 && msgpass || msgfail
+       msgtest "Test download of package file $1 with" "$APT"
+       aptget -qq download ${APT} && test -f $1 && msgpass || msgfail
 }
 
 testdownload apt_1.0_all.deb apt stable