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 fe352c76252c0bfc3040dd44ecd3394eb64f8fb0..63b31805600ffc05a34e6ade40faf48c49a8c89a 100755 (executable)
--- a/test/integration/test-apt-update-transactions
+++ b/test/integration/test-apt-update-transactions
@@ -47,21 +47,28 @@ testrun() {
 
 testsetup() {
        msgmsg 'Test with no initial data over' "$1"
+       redatereleasefiles 'now'
        rm -rf rootdir/var/lib/apt/lists
-       mkdir -m 700 -p rootdir/var/lib/apt/lists/partial
-       if [ "$(id -u)" = '0' ]; then
-               chown _apt:root rootdir/var/lib/apt/lists/partial
-       fi
+       mkdir -p rootdir/var/lib/apt/lists/partial
        listcurrentlistsdirectory > listsdir.lst
        testrun 'listsdir.lst'
 
        msgmsg 'Test with initial data over' "$1"
        testsuccess aptget update
        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'