Merge lp:~wgrant/launchpad/get-bpr-by-filename into lp:launchpad

[William Grant]

Add Archive.getBinaryPackageReleaseByFileName.

This branch adds Archive.getBinaryPackageReleaseByFileName, which I need for my PPA download stats branch series. The method itself is pretty obvious, except that it will return None in the (illegal and very unlikely, but occurring occasionally due to various bugs) case of multiple matching BPRs in the archive.

I also adjusted SoyuzTestPublisher.getPubBinaries to allow me to specify a version and arch-indepness without first creating a custom source. This was needed in the gBPRBFN test.

[Abel Deuring (adeuring)]

Hi William,

a very nice branch! Just one suggestion: You mention on in the MP and in the comment in test_returns_none_for_duplicate_file() bugs that make it possible to have more than one matching BPR. If we have related bugs filed in Launchpad, could you metion their numbers in the comment?

review: Approve (code)

=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2010-03-10 10:05:40 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2010-03-12 06:49:19 +0000
@@ -418,6 +418,14 @@
         :return the corresponding `ILibraryFileAlias` is the file was found.
         """
 
+    def getBinaryPackageReleaseByFileName(filename):
+        """Return the corresponding `IBinaryPackageRelease` in this context.
+
+        :param filename: The filename to look up.
+        :return: The `IBinaryPackageRelease` with the specified filename,
+            or None if it was not found.
+        """
+
     def requestPackageCopy(target_location, requestor, suite=None,
                            copy_binaries=False, reason=None):
         """Return a new `PackageCopyRequest` for this archive.

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-03-10 12:50:18 +0000
+++ lib/lp/soyuz/model/archive.py	2010-03-12 06:49:19 +0000
@@ -82,6 +82,7 @@
 from lp.soyuz.interfaces.processor import IProcessorFamilySet
 from lp.soyuz.interfaces.publishing import (
     active_publishing_status, PackagePublishingStatus, IPublishingSet)
+from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 from lp.soyuz.scripts.packagecopier import do_copy
 from canonical.launchpad.webapp.interfaces import (
@@ -1127,6 +1128,21 @@
 
         return archive_file
 
+    def getBinaryPackageReleaseByFileName(self, filename):
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        results = store.find(
+            BinaryPackageRelease,
+            BinaryPackageFile.binarypackagereleaseID ==
+                BinaryPackageRelease.id,
+            BinaryPackageFile.libraryfileID == LibraryFileAlias.id,
+            LibraryFileAlias.filename == filename,
+            BinaryPackagePublishingHistory.archive == self,
+            BinaryPackagePublishingHistory.binarypackagereleaseID ==
+                BinaryPackageRelease.id).config(distinct=True)
+        if results.count() > 1:
+            return None
+        return results.one()
+
     def requestPackageCopy(self, target_location, requestor, suite=None,
         copy_binaries=False, reason=None):
         """See `IArchive`."""

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-03-12 06:49:19 +0000
@@ -658,5 +658,89 @@
             CannotSwitchPrivacy, self.make_ppa_public, self.private_ppa)
 
 
+class TestGetBinaryPackageReleaseByFileName(TestCaseWithFactory):
+    """Ensure that getBinaryPackageReleaseByFileName works as expected."""
+
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        """Setup an archive with relevant publications."""
+        super(TestGetBinaryPackageReleaseByFileName, self).setUp()
+        self.publisher = SoyuzTestPublisher()
+        self.publisher.prepareBreezyAutotest()
+
+        self.archive = self.factory.makeArchive()
+        self.archive.require_virtualized = False
+
+        self.i386_pub, self.hppa_pub = self.publisher.getPubBinaries(
+            version="1.2.3-4", archive=self.archive, binaryname="foo-bin",
+            status=PackagePublishingStatus.PUBLISHED,
+            architecturespecific=True)
+
+        self.i386_indep_pub, self.hppa_indep_pub = (
+            self.publisher.getPubBinaries(
+                version="1.2.3-4", archive=self.archive, binaryname="bar-bin",
+                status=PackagePublishingStatus.PUBLISHED))
+
+    def test_returns_matching_binarypackagerelease(self):
+        # The BPR with a file by the given name should be returned.
+        self.assertEqual(
+            self.i386_pub.binarypackagerelease,
+            self.archive.getBinaryPackageReleaseByFileName(
+                "foo-bin_1.2.3-4_i386.deb"))
+
+    def test_returns_correct_architecture(self):
+        # The architecture is taken into account correctly.
+        self.assertEqual(
+            self.hppa_pub.binarypackagerelease,
+            self.archive.getBinaryPackageReleaseByFileName(
+                "foo-bin_1.2.3-4_hppa.deb"))
+
+    def test_works_with_architecture_independent_binaries(self):
+        # Architecture independent binaries with multiple publishings
+        # are found properly.
+        self.assertEqual(
+            self.i386_indep_pub.binarypackagerelease,
+            self.archive.getBinaryPackageReleaseByFileName(
+                "bar-bin_1.2.3-4_all.deb"))
+
+    def test_returns_none_for_source_file(self):
+        # None is returned if the file is a source component instead.
+        self.assertIs(
+            None,
+            self.archive.getBinaryPackageReleaseByFileName(
+                "foo_1.2.3-4.dsc"))
+
+    def test_returns_none_for_nonexistent_file(self):
+        # Non-existent files return None.
+        self.assertIs(
+            None,
+            self.archive.getBinaryPackageReleaseByFileName(
+                "this-is-not-real_1.2.3-4_all.deb"))
+
+    def test_returns_none_for_duplicate_file(self):
+        # In the unlikely case of multiple BPRs in this archive with the same
+        # name (hopefully impossible, but it still happens occasionally due
+        # to bugs), None is returned.
+
+        # Publish the same binaries again. Evil.
+        self.publisher.getPubBinaries(
+            version="1.2.3-4", archive=self.archive, binaryname="foo-bin",
+            status=PackagePublishingStatus.PUBLISHED,
+            architecturespecific=True)
+
+        self.assertIs(
+            None,
+            self.archive.getBinaryPackageReleaseByFileName(
+                "foo-bin_1.2.3-4_i386.deb"))
+
+    def test_returns_none_from_another_archive(self):
+        # Cross-archive searches are not performed.
+        self.assertIs(
+            None,
+            self.factory.makeArchive().getBinaryPackageReleaseByFileName(
+                "foo-bin_1.2.3-4_i386.deb"))
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2010-03-10 12:50:18 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2010-03-12 06:49:19 +0000
@@ -259,8 +259,12 @@
                        pocket=PackagePublishingPocket.RELEASE,
                        format=BinaryPackageFormat.DEB,
                        scheduleddeletiondate=None, dateremoved=None,
-                       distroseries=None, archive=None,
-                       pub_source=None, builder=None):
+                       distroseries=None,
+                       archive=None,
+                       pub_source=None,
+                       version='666',
+                       architecturespecific=False,
+                       builder=None):
         """Return a list of binary publishing records."""
         if distroseries is None:
             distroseries = self.distroseries
@@ -270,9 +274,15 @@
 
         if pub_source is None:
             sourcename = "%s" % binaryname.split('-')[0]
+            if architecturespecific:
+                architecturehintlist = 'any'
+            else:
+                architecturehintlist = 'all'
+
             pub_source = self.getPubSource(
                 sourcename=sourcename, status=status, pocket=pocket,
-                archive=archive, distroseries=distroseries)
+                archive=archive, distroseries=distroseries,
+                version=version, architecturehintlist=architecturehintlist)
         else:
             archive = pub_source.archive