From 4aeda477e7fda33523ebc6a94668085f5047d593 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 15 Nov 2010 10:55:15 +0100 Subject: * 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. --- debian/changelog | 4 ++++ test/integration/test-compressed-indexes | 1 + test/test-indexes.sh | 1 + 3 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2f95d2e00..71ca66100 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ apt (0.8.8ubuntu3) UNRELEASED; urgency=low * Add debian/apt.conf.changelog: Configuration for apt-changelog with the server for Ubuntu (changelogs.ubuntu.com). Install it in debian/rules. * doc/apt-changelog.1.xml: Document the new option. + * 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. -- Martin Pitt Fri, 12 Nov 2010 16:53:31 +0100 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 -- cgit v1.2.3