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 on 2010-10-07
Status: Merged
Approved by: Brad Crittenden on 2010-10-09
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 on 2010-10-09
Steve Kowalik (community) code* 2010-10-07 Approve on 2010-10-07
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.
Steve Kowalik (stevenk) wrote :

This looks good, thanks for the clean-up.

review: Approve (code*)
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
1=== modified file 'lib/lp/archivepublisher/tests/apt-data/Packages'
2--- lib/lp/archivepublisher/tests/apt-data/Packages 2010-04-15 01:45:41 +0000
3+++ lib/lp/archivepublisher/tests/apt-data/Packages 2010-10-07 05:51:45 +0000
4@@ -7,7 +7,7 @@
5 Source: quodlibet
6 Version: 0.13.1-1
7 Depends: 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)
8-Filename: pool/main/f/foo/foo.deb
9+Filename: pool/main/f/foo/foo_1_i386.deb
10 Size: 11884
11 MD5sum: c4908a901e44d6d5282f7889cd0b7cb0
12 SHA1: 1ef5dbfe0584c39718c78092dbbdaf417a51fc72
13
14=== modified file 'lib/lp/archivepublisher/tests/apt-data/Sources'
15--- lib/lp/archivepublisher/tests/apt-data/Sources 2006-08-24 11:57:44 +0000
16+++ lib/lp/archivepublisher/tests/apt-data/Sources 2010-10-07 05:51:45 +0000
17@@ -10,7 +10,7 @@
18 Format: 1.0
19 Directory: pool/main/f/foo
20 Files:
21- bf8ef0ec49274621a72c941fbd1d70ed 1326 foo.dsc
22+ bf8ef0ec49274621a72c941fbd1d70ed 1326 foo_1.dsc
23 ea140e23ae50a61a79902aa67da5214e 15134701 binutils_2.15.orig.tar.gz
24 2cf84daeca019220f5f3753121f012bb 36466 binutils_2.15-4.diff.gz
25
26
27=== renamed file 'lib/lp/archivepublisher/tests/apt-data/foo.dsc' => 'lib/lp/archivepublisher/tests/apt-data/foo_1.dsc'
28=== renamed file 'lib/lp/archivepublisher/tests/apt-data/foo.deb' => 'lib/lp/archivepublisher/tests/apt-data/foo_1_i386.deb'
29=== modified file 'lib/lp/archivepublisher/tests/apt-data/hoary-test_main_binary-i386'
30--- lib/lp/archivepublisher/tests/apt-data/hoary-test_main_binary-i386 2006-08-24 11:57:44 +0000
31+++ lib/lp/archivepublisher/tests/apt-data/hoary-test_main_binary-i386 2010-10-07 05:51:45 +0000
32@@ -1,1 +1,1 @@
33-/var/tmp/archive/ubuntutest/pool/main/f/foo/foo.deb
34+/var/tmp/archive/ubuntutest/pool/main/f/foo/foo_1_i386.deb
35
36=== modified file 'lib/lp/archivepublisher/tests/apt-data/hoary-test_main_source'
37--- lib/lp/archivepublisher/tests/apt-data/hoary-test_main_source 2006-08-24 11:57:44 +0000
38+++ lib/lp/archivepublisher/tests/apt-data/hoary-test_main_source 2010-10-07 05:51:45 +0000
39@@ -1,1 +1,1 @@
40-/var/tmp/archive/ubuntutest/pool/main/f/foo/foo.dsc
41+/var/tmp/archive/ubuntutest/pool/main/f/foo/foo_1.dsc
42
43=== modified file 'lib/lp/archivepublisher/tests/test_ftparchive.py'
44--- lib/lp/archivepublisher/tests/test_ftparchive.py 2010-10-04 19:50:45 +0000
45+++ lib/lp/archivepublisher/tests/test_ftparchive.py 2010-10-07 05:51:45 +0000
46@@ -257,9 +257,9 @@
47 fa = self._setUpFTPArchiveHandler()
48
49 source_files = FakeSelectResult(
50- [('foo', 'hoary-test', 'foo.dsc', 'main')])
51+ [('foo', 'hoary-test', 'foo_1.dsc', 'main')])
52 binary_files = FakeSelectResult(
53- [('foo', 'hoary-test', 'foo.deb', 'main', 'binary-i386')])
54+ [('foo', 'hoary-test', 'foo_1_i386.deb', 'main', 'binary-i386')])
55 fa.publishFileLists(source_files, binary_files)
56
57 # Check that the file lists generated by LP exist and have the
58@@ -286,14 +286,14 @@
59
60 # Calculate filelists.
61 source_files = FakeSelectResult(
62- [('foo', 'hoary-test', 'foo.dsc', 'main')])
63+ [('foo', 'hoary-test', 'foo_1.dsc', 'main')])
64 binary_files = FakeSelectResult(
65- [('foo', 'hoary-test', 'foo.deb', 'main', 'binary-i386')])
66+ [('foo', 'hoary-test', 'foo_1_i386.deb', 'main', 'binary-i386')])
67 fa.publishFileLists(source_files, binary_files)
68
69 # Add mentioned files in the repository pool/.
70- self._addRepositoryFile('main', 'foo', 'foo.dsc')
71- self._addRepositoryFile('main', 'foo', 'foo.deb')
72+ self._addRepositoryFile('main', 'foo', 'foo_1.dsc')
73+ self._addRepositoryFile('main', 'foo', 'foo_1_i386.deb')
74
75 # XXX cprov 2007-03-21: Relying on byte-to-byte configuration file
76 # comparing is weak. We should improve this methodology to avoid