APT

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

Proposed by Martin Pitt
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 Approve
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.
Revision history for this message
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
=== 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 @@
21 - don't install previously not installed providers in a try21 - don't install previously not installed providers in a try
22 to statisfy a "Breaks: provides" dependency by upgrade22 to statisfy a "Breaks: provides" dependency by upgrade
2323
24 [ Martin Pitt ]
25 * test/integration/test-compressed-indexes, test/test-indexes.sh:
26 - Explicitly disable compressed indexes at the start. This ensures that we
27 will actually test uncompressed indexes regardless of the internal
28 default value of Acquire::GzipIndexes.
29
24 -- David Kalnischkies <kalnischkies@gmail.com> Wed, 10 Nov 2010 13:22:39 +010030 -- David Kalnischkies <kalnischkies@gmail.com> Wed, 10 Nov 2010 13:22:39 +0100
2531
26apt (0.8.8) unstable; urgency=low32apt (0.8.8) unstable; urgency=low
2733
=== 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 @@
69 rm -rf testpkg-1.069 rm -rf testpkg-1.0
70}70}
7171
72echo 'Acquire::GzipIndexes "false";' > rootdir/etc/apt/apt.conf.d/02compressindex
72msgmsg "File: Test with uncompressed indexes"73msgmsg "File: Test with uncompressed indexes"
73testrun74testrun
7475
7576
=== 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 @@
144! LC_MESSAGES=C $APT_CACHE show bash 2>&1| grep -q 'E: No packages found'144! LC_MESSAGES=C $APT_CACHE show bash 2>&1| grep -q 'E: No packages found'
145145
146echo "===== uncompressed indexes ====="146echo "===== uncompressed indexes ====="
147echo 'Acquire::GzipIndexes "false";' > etc/apt/apt.conf.d/02compress-indexes
147check_update148check_update
148check_indexes149check_indexes
149check_cache150check_cache

Subscribers

People subscribed via source and target branches

to all changes: