summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-10-02 18:28:55 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-10-02 18:28:55 +0200
commit1ce243188c2ba218f5dce8ec8b40556d58ed8ec2 (patch)
tree17cff394ef4d6fccfd121aa7afcfdf920673859c /test
parent61aea84df918a4257ea1233e48e5860529ecfc9b (diff)
cleanup around pkgAcqMetaSig and improved tests
Diffstat (limited to 'test')
-rwxr-xr-xtest/integration/test-apt-update-ims34
1 files changed, 29 insertions, 5 deletions
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index 946dfc7af..38dcd73fd 100755
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -20,11 +20,7 @@ runtest() {
testfailure ls "rootdir/var/lib/apt/lists/partial/*"
# check that I-M-S header is kept in redirections
- testequal "Hit http://localhost:8080 unstable InRelease
-Hit http://localhost:8080 unstable/main Sources
-Hit http://localhost:8080 unstable/main amd64 Packages
-Hit http://localhost:8080 unstable/main Translation-en
-Reading package lists..." aptget update -o Debug::pkgAcquire::Worker=0 -o Debug::Acquire::http=0
+ testequal "$EXPECT" aptget update -o Debug::pkgAcquire::Worker=0 -o Debug::Acquire::http=0
# ensure that we still do a hash check on ims hit
msgtest 'Test I-M-S reverify'
@@ -34,6 +30,34 @@ Reading package lists..." aptget update -o Debug::pkgAcquire::Worker=0 -o Debug
testfailure ls "rootdir/var/lib/apt/lists/partial/*"
}
+EXPECT="Hit http://localhost:8080 unstable InRelease
+Hit http://localhost:8080 unstable/main Sources
+Hit http://localhost:8080 unstable/main amd64 Packages
+Hit http://localhost:8080 unstable/main Translation-en
+Reading package lists..."
+# with InRelease
+runtest
+
+# with gzip
+echo "Acquire::GzipIndexes "1";" > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest
+
+# FIXME: how can we get rid of this extra line
+# "Get:1 http://localhost:8080 unstable Release.gpg"
+#
+# with Release/Release.gpg
+EXPECT="Ign http://localhost:8080 unstable InRelease
+Hit http://localhost:8080 unstable Release
+Hit http://localhost:8080 unstable Release.gpg
+Get:1 http://localhost:8080 unstable Release.gpg
+Hit http://localhost:8080 unstable/main Sources
+Hit http://localhost:8080 unstable/main amd64 Packages
+Hit http://localhost:8080 unstable/main Translation-en
+Reading package lists..."
+
+find aptarchive -name "InRelease" | xargs rm -f
+
+echo "Acquire::GzipIndexes "0";" > rootdir/etc/apt/apt.conf.d/02compressindex
runtest
echo "Acquire::GzipIndexes "1";" > rootdir/etc/apt/apt.conf.d/02compressindex