summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin@piware.de>2010-11-15 10:41:12 +0100
committerMartin Pitt <martin@piware.de>2010-11-15 10:41:12 +0100
commitd88a49c830c2ea7e942125be37703bc411277ac1 (patch)
treef8acf67cf395798e9519ee63da43ad1b67596601
parent3cf1e4b50a9bb439c4f54a631cfebbb6c4d1ea7d (diff)
* 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.
-rw-r--r--debian/changelog6
-rwxr-xr-xtest/integration/test-compressed-indexes1
-rwxr-xr-xtest/test-indexes.sh1
3 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d0bfaa389..cbf3a5dcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,12 @@ apt (0.8.9) UNRELEASED; urgency=low
- 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 <kalnischkies@gmail.com> Wed, 10 Nov 2010 13:22:39 +0100
apt (0.8.8) unstable; urgency=low
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