launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/bug-655648-a-f-maverick into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #655648 test_ftparchive failing on Maverick
  https://bugs.launchpad.net/bugs/655648


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.
-- 
https://code.launchpad.net/~wgrant/launchpad/bug-655648-a-f-maverick/+merge/37820
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/bug-655648-a-f-maverick into lp:launchpad/devel.

=== 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 @@
 Source: quodlibet
 Version: 0.13.1-1
 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)
-Filename: pool/main/f/foo/foo.deb
+Filename: pool/main/f/foo/foo_1_i386.deb
 Size: 11884
 MD5sum: c4908a901e44d6d5282f7889cd0b7cb0
 SHA1: 1ef5dbfe0584c39718c78092dbbdaf417a51fc72

=== 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 @@
 Format: 1.0
 Directory: pool/main/f/foo
 Files:
- bf8ef0ec49274621a72c941fbd1d70ed 1326 foo.dsc
+ bf8ef0ec49274621a72c941fbd1d70ed 1326 foo_1.dsc
  ea140e23ae50a61a79902aa67da5214e 15134701 binutils_2.15.orig.tar.gz
  2cf84daeca019220f5f3753121f012bb 36466 binutils_2.15-4.diff.gz
 

=== 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 @@
-/var/tmp/archive/ubuntutest/pool/main/f/foo/foo.deb
+/var/tmp/archive/ubuntutest/pool/main/f/foo/foo_1_i386.deb

=== 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 @@
-/var/tmp/archive/ubuntutest/pool/main/f/foo/foo.dsc
+/var/tmp/archive/ubuntutest/pool/main/f/foo/foo_1.dsc

=== 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 @@
         fa = self._setUpFTPArchiveHandler()
 
         source_files = FakeSelectResult(
-            [('foo', 'hoary-test', 'foo.dsc', 'main')])
+            [('foo', 'hoary-test', 'foo_1.dsc', 'main')])
         binary_files = FakeSelectResult(
-            [('foo', 'hoary-test', 'foo.deb', 'main', 'binary-i386')])
+            [('foo', 'hoary-test', 'foo_1_i386.deb', 'main', 'binary-i386')])
         fa.publishFileLists(source_files, binary_files)
 
         # Check that the file lists generated by LP exist and have the
@@ -286,14 +286,14 @@
 
         # Calculate filelists.
         source_files = FakeSelectResult(
-            [('foo', 'hoary-test', 'foo.dsc', 'main')])
+            [('foo', 'hoary-test', 'foo_1.dsc', 'main')])
         binary_files = FakeSelectResult(
-            [('foo', 'hoary-test', 'foo.deb', 'main', 'binary-i386')])
+            [('foo', 'hoary-test', 'foo_1_i386.deb', 'main', 'binary-i386')])
         fa.publishFileLists(source_files, binary_files)
 
         # Add mentioned files in the repository pool/.
-        self._addRepositoryFile('main', 'foo', 'foo.dsc')
-        self._addRepositoryFile('main', 'foo', 'foo.deb')
+        self._addRepositoryFile('main', 'foo', 'foo_1.dsc')
+        self._addRepositoryFile('main', 'foo', 'foo_1_i386.deb')
 
         # XXX cprov 2007-03-21: Relying on byte-to-byte configuration file
         # comparing is weak. We should improve this methodology to avoid