APT

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

Proposed by Martin Pitt on 2010-11-15
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~pitti/apt/compressed-indexes
Merge into: lp:~mvo/apt/debian-sid
Diff against target: 40 lines (+8/-0)
3 files modified
debian/changelog (+6/-0)
test/integration/test-compressed-indexes (+1/-0)
test/test-indexes.sh (+1/-0)
To merge this branch: bzr merge lp:~pitti/apt/compressed-indexes
Reviewer Review Type Date Requested Status
Michael Vogt 2010-11-15 Approve on 2010-11-25
Review via email: mp+40842@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Thanks, looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-13 12:26:31 +0000
3+++ debian/changelog 2010-11-15 09:45:33 +0000
4@@ -21,6 +21,12 @@
5 - don't install previously not installed providers in a try
6 to statisfy a "Breaks: provides" dependency by upgrade
7
8+ [ Martin Pitt ]
9+ * test/integration/test-compressed-indexes, test/test-indexes.sh:
10+ - Explicitly disable compressed indexes at the start. This ensures that we
11+ will actually test uncompressed indexes regardless of the internal
12+ default value of Acquire::GzipIndexes.
13+
14 -- David Kalnischkies <kalnischkies@gmail.com> Wed, 10 Nov 2010 13:22:39 +0100
15
16 apt (0.8.8) unstable; urgency=low
17
18=== modified file 'test/integration/test-compressed-indexes'
19--- test/integration/test-compressed-indexes 2010-10-13 13:22:48 +0000
20+++ test/integration/test-compressed-indexes 2010-11-15 09:45:33 +0000
21@@ -69,6 +69,7 @@
22 rm -rf testpkg-1.0
23 }
24
25+echo 'Acquire::GzipIndexes "false";' > rootdir/etc/apt/apt.conf.d/02compressindex
26 msgmsg "File: Test with uncompressed indexes"
27 testrun
28
29
30=== modified file 'test/test-indexes.sh'
31--- test/test-indexes.sh 2010-10-15 15:54:36 +0000
32+++ test/test-indexes.sh 2010-11-15 09:45:33 +0000
33@@ -144,6 +144,7 @@
34 ! LC_MESSAGES=C $APT_CACHE show bash 2>&1| grep -q 'E: No packages found'
35
36 echo "===== uncompressed indexes ====="
37+echo 'Acquire::GzipIndexes "false";' > etc/apt/apt.conf.d/02compress-indexes
38 check_update
39 check_indexes
40 check_cache

Subscribers

People subscribed via source and target branches

to all changes: