Merge branch 'debian/sid' into debian/experimental

[apt.git] / test / integration / test-apt-update-transactions

diff --git a/test/integration/test-apt-update-transactions b/test/integration/test-apt-update-transactions
index 2fc5f1dadfbfd589ecfe7f7584a0142a75126268..63b31805600ffc05a34e6ade40faf48c49a8c89a 100755 (executable)
--- a/test/integration/test-apt-update-transactions
+++ b/test/integration/test-apt-update-transactions
@@ -25,44 +25,50 @@ restorefile() {
        mv "${1}.bak" "$1"
 }
 
-listscheck() {
-       testequal "$(cat $1)" ls rootdir/var/lib/apt/lists
-}
-
 testrun() {
        # produce an unsigned repository
        find aptarchive \( -name 'Release.gpg' -o -name 'InRelease' \) -delete
        testfailure aptget update --no-allow-insecure-repositories
-       listscheck "$1"
+       testfileequal "$1" "$(listcurrentlistsdirectory)"
 
        # signed but broken
        signreleasefiles
 
        breakfile aptarchive/dists/unstable/main/binary-i386/Packages
        testfailure aptget update
-       listscheck "$1"
+       testfileequal "$1" "$(listcurrentlistsdirectory)"
        restorefile aptarchive/dists/unstable/main/binary-i386/Packages
 
        breakfile aptarchive/dists/unstable/main/source/Sources
        testfailure aptget update
-       listscheck "$1"
+       testfileequal "$1" "$(listcurrentlistsdirectory)"
        restorefile aptarchive/dists/unstable/main/source/Sources
 }
 
 testsetup() {
        msgmsg 'Test with no initial data over' "$1"
+       redatereleasefiles 'now'
        rm -rf rootdir/var/lib/apt/lists
        mkdir -p rootdir/var/lib/apt/lists/partial
-       ls rootdir/var/lib/apt/lists > listsdir.lst
+       listcurrentlistsdirectory > listsdir.lst
        testrun 'listsdir.lst'
 
        msgmsg 'Test with initial data over' "$1"
        testsuccess aptget update
-       ls rootdir/var/lib/apt/lists > listsdir.lst
+       listcurrentlistsdirectory > listsdir.lst
+       redatereleasefiles '+1hour'
        testrun 'listsdir.lst'
 }
 
 testsetup 'file'
+
 changetowebserver
+webserverconfig 'aptwebserver::support::modified-since' 'false' "$1"
+webserverconfig 'aptwebserver::support::last-modified' 'false' "$1"  # curl is clever and sees hits here also
+webserverconfig 'aptwebserver::support::range' 'false' "$1"
+
 testsetup 'http'
 
+changetohttpswebserver
+
+testsetup 'https'