diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-17 14:11:50 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-17 14:11:50 +0200 |
| commit | 33cb8ac173733b716cbaec5ae0e7296cd75bca8d (patch) | |
| tree | dff46d3395ce0e00af390ee5a88ead5c2dc6cfbf /test | |
| parent | 7567b2abe424451e01d6e55c3fd14d37a4c150bf (diff) | |
merge 0.9.7.9+deb7u3
Diffstat (limited to 'test')
| -rwxr-xr-x | test/integration/test-apt-get-download | 13 | ||||
| -rwxr-xr-x | test/integration/test-hashsum-verification | 14 |
2 files changed, 24 insertions, 3 deletions
diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download index b164f7dba..4b7b683d8 100755 --- a/test/integration/test-apt-get-download +++ b/test/integration/test-apt-get-download @@ -30,3 +30,16 @@ testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) sha256:$(sh # deb:677887 testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms + + +# ensure authentication warning is displayed +rm aptarchive/dists/unstable/*Release* +testsuccess aptget update +testequal "WARNING: The following packages cannot be authenticated! + apt +E: Some packages could not be authenticated" aptget download -qq apt + +# ensure authentication warning is displayed +testequal "WARNING: The following packages cannot be authenticated! + apt +Authentication warning overridden." aptget download -qq --allow-unauthenticated apt diff --git a/test/integration/test-hashsum-verification b/test/integration/test-hashsum-verification index 99ea8bffa..2cc160389 100755 --- a/test/integration/test-hashsum-verification +++ b/test/integration/test-hashsum-verification @@ -66,7 +66,7 @@ runtest() { msgtest 'No package from the source available' [ "$(aptcache show apt 2>&1)" = "E: No packages found" ] && msgpass || msgfail msgtest 'No Packages file in /var/lib/apt/lists' - [ "$(ls rootdir/var/lib/apt/lists/*Package* 2>/dev/null)" = "" ] && msgpass || msgfail + [ "$(ls rootdir/var/lib/apt/lists/*Package* 2>/dev/null | grep -v FAILED 2>/dev/null)" = "" ] && msgpass || msgfail # now with the unsigned Release file rm -rf rootdir/var/lib/apt/lists @@ -77,5 +77,13 @@ runtest() { } -runtest - +for COMPRESSEDINDEXES in 'false' 'true'; do + echo "Acquire::GzipIndexes \"$COMPRESSEDINDEXES\";" > rootdir/etc/apt/apt.conf.d/compressindexes + if $COMPRESSEDINDEXES; then + msgmsg 'Run tests with GzipIndexes enabled' + else + msgmsg 'Run tests with GzipIndexes disabled' + fi + + runtest +done |