Launchpad itself

Merge lp:~wgrant/launchpad/bug-655648-a-f-maverick into lp:launchpad

  1. bug-655648-a-f-maverick
  2. Merge into devel
Proposed by William Grant
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: 11726
Proposed branch: lp:~wgrant/launchpad/bug-655648-a-f-maverick
Merge into: lp:launchpad
Diff against target: 76 lines (+10/-10)
5 files modified
lib/lp/archivepublisher/tests/apt-data/Packages (+1/-1)
lib/lp/archivepublisher/tests/apt-data/Sources (+1/-1)
lib/lp/archivepublisher/tests/apt-data/hoary-test_main_binary-i386 (+1/-1)
lib/lp/archivepublisher/tests/apt-data/hoary-test_main_source (+1/-1)
lib/lp/archivepublisher/tests/test_ftparchive.py (+6/-6)
To merge this branch: bzr merge lp:~wgrant/launchpad/bug-655648-a-f-maverick
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Steve Kowalik (community) code* Approve
Review via email: mp+37820@code.launchpad.net

Commit message

test_ftparchive now works on maverick. - Landed by bac.

Description of the change

maverick's apt-ftparchive has introduced a new level of pedantry -- if a binary file's name is not valid, it will be silently skipped. This causes test_generateConfig to fail.

This branches fixes the apt-ftparchive test files to have valid names, making the test pass on maverick.

To post a comment you must log in.
Revision history for this message
Steve Kowalik (stevenk) wrote :

This looks good, thanks for the clean-up.

review: Approve (code*)
Revision history for this message
Brad Crittenden (bac) wrote :

Thanks for the fix, William. Steve will you take responsibility for landing this when PQM opens?

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/archivepublisher/tests/apt-data/Packages'
--- lib/lp/archivepublisher/tests/apt-data/Packages 2010-04-15 01:45:41 +0000
+++ lib/lp/archivepublisher/tests/apt-data/Packages 2010-10-07 05:51:45 +0000
@@ -7,7 +7,7 @@
7Source: quodlibet7Source: quodlibet
8Version: 0.13.1-18Version: 0.13.1-1
9Depends: libatk1.0-0 (>= 1.9.0), libc6 (>= 2.3.4-1), libcairo2 (>= 1.0.2), libfontconfig1 (>= 2.3.0), libglib2.0-0 (>= 2.8.0), libgtk2.0-0 (>= 2.8.0), libpango1.0-0 (>= 1.10.1), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, quodlibet (= 0.13.1-1)9Depends: libatk1.0-0 (>= 1.9.0), libc6 (>= 2.3.4-1), libcairo2 (>= 1.0.2), libfontconfig1 (>= 2.3.0), libglib2.0-0 (>= 2.8.0), libgtk2.0-0 (>= 2.8.0), libpango1.0-0 (>= 1.10.1), libx11-6, libxcursor1 (>> 1.1.2), libxext6, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, quodlibet (= 0.13.1-1)
10Filename: pool/main/f/foo/foo.deb10Filename: pool/main/f/foo/foo_1_i386.deb
11Size: 1188411Size: 11884
12MD5sum: c4908a901e44d6d5282f7889cd0b7cb012MD5sum: c4908a901e44d6d5282f7889cd0b7cb0
13SHA1: 1ef5dbfe0584c39718c78092dbbdaf417a51fc7213SHA1: 1ef5dbfe0584c39718c78092dbbdaf417a51fc72
1414
=== modified file 'lib/lp/archivepublisher/tests/apt-data/Sources'
--- lib/lp/archivepublisher/tests/apt-data/Sources 2006-08-24 11:57:44 +0000
+++ lib/lp/archivepublisher/tests/apt-data/Sources 2010-10-07 05:51:45 +0000
@@ -10,7 +10,7 @@
10Format: 1.010Format: 1.0
11Directory: pool/main/f/foo11Directory: pool/main/f/foo
12Files:12Files:
13 bf8ef0ec49274621a72c941fbd1d70ed 1326 foo.dsc13 bf8ef0ec49274621a72c941fbd1d70ed 1326 foo_1.dsc
14 ea140e23ae50a61a79902aa67da5214e 15134701 binutils_2.15.orig.tar.gz14 ea140e23ae50a61a79902aa67da5214e 15134701 binutils_2.15.orig.tar.gz
15 2cf84daeca019220f5f3753121f012bb 36466 binutils_2.15-4.diff.gz15 2cf84daeca019220f5f3753121f012bb 36466 binutils_2.15-4.diff.gz
1616
1717
=== renamed file 'lib/lp/archivepublisher/tests/apt-data/foo.dsc' => 'lib/lp/archivepublisher/tests/apt-data/foo_1.dsc'
=== renamed file 'lib/lp/archivepublisher/tests/apt-data/foo.deb' => 'lib/lp/archivepublisher/tests/apt-data/foo_1_i386.deb'
=== modified file 'lib/lp/archivepublisher/tests/apt-data/hoary-test_main_binary-i386'
--- lib/lp/archivepublisher/tests/apt-data/hoary-test_main_binary-i386 2006-08-24 11:57:44 +0000
+++ lib/lp/archivepublisher/tests/apt-data/hoary-test_main_binary-i386 2010-10-07 05:51:45 +0000
@@ -1,1 +1,1 @@
1/var/tmp/archive/ubuntutest/pool/main/f/foo/foo.deb1/var/tmp/archive/ubuntutest/pool/main/f/foo/foo_1_i386.deb
22
=== modified file 'lib/lp/archivepublisher/tests/apt-data/hoary-test_main_source'
--- lib/lp/archivepublisher/tests/apt-data/hoary-test_main_source 2006-08-24 11:57:44 +0000
+++ lib/lp/archivepublisher/tests/apt-data/hoary-test_main_source 2010-10-07 05:51:45 +0000
@@ -1,1 +1,1 @@
1/var/tmp/archive/ubuntutest/pool/main/f/foo/foo.dsc1/var/tmp/archive/ubuntutest/pool/main/f/foo/foo_1.dsc
22
=== modified file 'lib/lp/archivepublisher/tests/test_ftparchive.py'
--- lib/lp/archivepublisher/tests/test_ftparchive.py 2010-10-04 19:50:45 +0000
+++ lib/lp/archivepublisher/tests/test_ftparchive.py 2010-10-07 05:51:45 +0000
@@ -257,9 +257,9 @@
257 fa = self._setUpFTPArchiveHandler()257 fa = self._setUpFTPArchiveHandler()
258258
259 source_files = FakeSelectResult(259 source_files = FakeSelectResult(
260 [('foo', 'hoary-test', 'foo.dsc', 'main')])260 [('foo', 'hoary-test', 'foo_1.dsc', 'main')])
261 binary_files = FakeSelectResult(261 binary_files = FakeSelectResult(
262 [('foo', 'hoary-test', 'foo.deb', 'main', 'binary-i386')])262 [('foo', 'hoary-test', 'foo_1_i386.deb', 'main', 'binary-i386')])
263 fa.publishFileLists(source_files, binary_files)263 fa.publishFileLists(source_files, binary_files)
264264
265 # Check that the file lists generated by LP exist and have the265 # Check that the file lists generated by LP exist and have the
@@ -286,14 +286,14 @@
286286
287 # Calculate filelists.287 # Calculate filelists.
288 source_files = FakeSelectResult(288 source_files = FakeSelectResult(
289 [('foo', 'hoary-test', 'foo.dsc', 'main')])289 [('foo', 'hoary-test', 'foo_1.dsc', 'main')])
290 binary_files = FakeSelectResult(290 binary_files = FakeSelectResult(
291 [('foo', 'hoary-test', 'foo.deb', 'main', 'binary-i386')])291 [('foo', 'hoary-test', 'foo_1_i386.deb', 'main', 'binary-i386')])
292 fa.publishFileLists(source_files, binary_files)292 fa.publishFileLists(source_files, binary_files)
293293
294 # Add mentioned files in the repository pool/.294 # Add mentioned files in the repository pool/.
295 self._addRepositoryFile('main', 'foo', 'foo.dsc')295 self._addRepositoryFile('main', 'foo', 'foo_1.dsc')
296 self._addRepositoryFile('main', 'foo', 'foo.deb')296 self._addRepositoryFile('main', 'foo', 'foo_1_i386.deb')
297297
298 # XXX cprov 2007-03-21: Relying on byte-to-byte configuration file298 # XXX cprov 2007-03-21: Relying on byte-to-byte configuration file
299 # comparing is weak. We should improve this methodology to avoid299 # comparing is weak. We should improve this methodology to avoid