Merge lp:~cjwatson/launchpad/bpph-phase-2 into lp:launchpad

[Colin Watson]

Fix ordering of binary overrides.

== Summary ==

I messed up the archivepublisher code in https://code.launchpad.net/~cjwatson/launchpad/bpph-phase/+merge/144154 slightly and only found out about it in QA. This branch corrects my embarrassment.

The fields are in a slightly peculiar order because the function that consumes them is shared between source and binary overrides.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/archivepublisher/model/ftparchive.py'
--- lib/lp/archivepublisher/model/ftparchive.py	2013-02-13 14:14:04 +0000
+++ lib/lp/archivepublisher/model/ftparchive.py	2013-02-27 01:21:22 +0000
@@ -276,7 +276,7 @@
         """Fetch override information about all published binaries.
 
         The override information consists of tuples with 'binaryname',
-        'architecture', 'component', 'section' and 'priority' strings and
+        'component', 'section', 'architecture' and 'priority' strings and
         'phased_update_percentage' integers, in this order.
 
         :param distroseries: target `IDistroSeries`
@@ -307,8 +307,8 @@
             return EmptyResultSet()
 
         result_set = store.using(*origins).find(
-            (BinaryPackageName.name, DistroArchSeries.architecturetag,
-             Component.name, Section.name,
+            (BinaryPackageName.name, Component.name, Section.name,
+             DistroArchSeries.architecturetag,
              BinaryPackagePublishingHistory.priority,
              BinaryPackagePublishingHistory.phased_update_percentage),
             BinaryPackagePublishingHistory.archive == self.publisher.archive,

=== modified file 'lib/lp/archivepublisher/tests/test_ftparchive.py'
--- lib/lp/archivepublisher/tests/test_ftparchive.py	2013-01-21 16:28:14 +0000
+++ lib/lp/archivepublisher/tests/test_ftparchive.py	2013-02-27 01:21:22 +0000
@@ -9,6 +9,7 @@
 import os
 import re
 import shutil
+from textwrap import dedent
 
 from zope.component import getUtility
 
@@ -26,7 +27,10 @@
     BufferLogger,
     DevNullLogger,
     )
-from lp.soyuz.enums import PackagePublishingPriority
+from lp.soyuz.enums import (
+    PackagePublishingPriority,
+    PackagePublishingStatus,
+    )
 from lp.testing import TestCaseWithFactory
 from lp.testing.dbuser import switch_dbuser
 from lp.testing.layers import (
@@ -53,6 +57,9 @@
     def __init__(self, archive):
         self.archive = archive
 
+    def isAllowed(self, distroseries, pocket):
+        return True
+
 
 class FakeSelectResult:
     """Receive a list and emulate a SelectResult object."""
@@ -179,7 +186,8 @@
 
     def test_getBinariesForOverrides(self):
         # getBinariesForOverrides returns a list of tuples containing:
-        # (sourcename, component, section, priority)
+        # (sourcename, component, section, archtag, priority,
+        # phased_update_percentage)
 
         # Reconfigure FTPArchiveHandler to retrieve sampledata overrides.
         fa = self._setUpFTPArchiveHandler()
@@ -190,9 +198,9 @@
         published_binaries = fa.getBinariesForOverrides(
             hoary, PackagePublishingPocket.RELEASE)
         expectedBinaries = [
-            ('pmount', 'hppa', 'main', 'base',
+            ('pmount', 'main', 'base', 'hppa',
              PackagePublishingPriority.EXTRA, None),
-            ('pmount', 'i386', 'universe', 'editors',
+            ('pmount', 'universe', 'editors', 'i386',
              PackagePublishingPriority.IMPORTANT, None),
             ]
         self.assertEqual(expectedBinaries, list(published_binaries))
@@ -248,6 +256,32 @@
                 "foo/i386\tPhased-Update-Percentage\t50",
                 result_file.read().splitlines())
 
+    def test_generateOverrides(self):
+        # generateOverrides generates all the overrides from start to finish.
+        self._distribution = getUtility(IDistributionSet).getByName('ubuntu')
+        self._archive = self._distribution.main_archive
+        self._publisher = SamplePublisher(self._archive)
+        fa = self._setUpFTPArchiveHandler()
+        pubs = self._archive.getAllPublishedBinaries(
+            name="pmount", status=PackagePublishingStatus.PUBLISHED,
+            distroarchseries=self._distribution.getSeries("hoary")["hppa"])
+        for pub in pubs:
+            pub.changeOverride(new_phased_update_percentage=30).setPublished()
+        fa.generateOverrides(fullpublish=True)
+        result_path = os.path.join(self._overdir, "override.hoary.main")
+        with open(result_path) as result_file:
+            self.assertEqual("pmount\textra\tbase\n", result_file.read())
+        result_path = os.path.join(self._overdir, "override.hoary.main.src")
+        with open(result_path) as result_file:
+            self.assertIn("pmount\teditors\n", result_file.readlines())
+        result_path = os.path.join(self._overdir, "override.hoary.extra.main")
+        with open(result_path) as result_file:
+            self.assertEqual(dedent("""\
+                pmount\tOrigin\tUbuntu
+                pmount\tBugs\thttps://bugs.launchpad.net/ubuntu/+filebug
+                pmount/hppa\tPhased-Update-Percentage\t30
+                """), result_file.read())
+
     def test_getSourceFiles(self):
         # getSourceFiles returns a list of tuples containing:
         # (sourcename, filename, component)