merged from lp:~pitti/apt/compressed-indexes

3 files changed, 12 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index df4fc1a29..a786d43df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.8.10) UNRELEASED; urgency=low
+
+  [ Martin Pitt ]
+  * test/integration/test-compressed-indexes, test/test-indexes.sh:
+    - Explicitly disable compressed indexes at the start. This ensures that we
+      will actually test uncompressed indexes regardless of the internal
+      default value of Acquire::GzipIndexes.
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 25 Nov 2010 16:08:01 +0100
+
 apt (0.8.9) unstable; urgency=low
 
   [ Christian Perrier ]
diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes
index 97a1453f7..be33edbb7 100755
--- a/test/integration/test-compressed-indexes
+++ b/test/integration/test-compressed-indexes
@@ -69,6 +69,7 @@ testrun() {
 	rm -rf testpkg-1.0
 }
 
+echo 'Acquire::GzipIndexes "false";' > rootdir/etc/apt/apt.conf.d/02compressindex
 msgmsg "File: Test with uncompressed indexes"
 testrun
 
diff --git a/test/test-indexes.sh b/test/test-indexes.sh
index 17363718d..50d54f691 100755
--- a/test/test-indexes.sh
+++ b/test/test-indexes.sh
@@ -144,6 +144,7 @@ echo '--- apt-cache show works without indexes'
 ! LC_MESSAGES=C $APT_CACHE show bash 2>&1| grep -q 'E: No packages found'
 
 echo "===== uncompressed indexes ====="
+echo 'Acquire::GzipIndexes "false";' > etc/apt/apt.conf.d/02compress-indexes
 check_update
 check_indexes
 check_cache