Merge lp:~pitti/apt/compressed-indexes into lp:~mvo/apt/debian-sid

[Martin Pitt]

Fix/robustify test cases to still work when we change the internal default value of Acquire::GzipIndexes to true.

[Michael Vogt (mvo)]

Thanks, looks good!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-13 12:26:31 +0000
+++ debian/changelog	2010-11-15 09:45:33 +0000
@@ -21,6 +21,12 @@
     - don't install previously not installed providers in a try
       to statisfy a "Breaks: provides" dependency by upgrade
 
+  [ 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.
+
  -- David Kalnischkies <[e-mail]>  Wed, 10 Nov 2010 13:22:39 +0100
 
 apt (0.8.8) unstable; urgency=low

=== modified file 'test/integration/test-compressed-indexes'
--- test/integration/test-compressed-indexes	2010-10-13 13:22:48 +0000
+++ test/integration/test-compressed-indexes	2010-11-15 09:45:33 +0000
@@ -69,6 +69,7 @@
 	rm -rf testpkg-1.0
 }
 
+echo 'Acquire::GzipIndexes "false";' > rootdir/etc/apt/apt.conf.d/02compressindex
 msgmsg "File: Test with uncompressed indexes"
 testrun
 

=== modified file 'test/test-indexes.sh'
--- test/test-indexes.sh	2010-10-15 15:54:36 +0000
+++ test/test-indexes.sh	2010-11-15 09:45:33 +0000
@@ -144,6 +144,7 @@
 ! 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