Merge lp:~james-w/launchpad/improve-makeDistroArchSeries into lp:launchpad

[James Westby]

makeDistroArchSeries now creates a new ProcessorFamily and ensures that it has at least one processor.

Hi,

A small change around makeDistroArchSeries:

  1. Test the method.
  2. remove an unused attribute that prevents verifyObject from passing.
  3. Have the method create a ProcessorFamily rather than using sampledata, and ensure there is at least one processor in that family.

Thanks,

James

[Jonathan Lange (jml)]

Thanks so much !

review: Approve

[lp:~james-w/launchpad/improve-makeDistroArchSeries]

11320. By James Westby on 2010-08-06

Merged no-more-sampledata-2 into improve-makeDistroArchSeries.

11321. By James Westby on 2010-08-06

Merged no-more-sampledata-2 into improve-makeDistroArchSeries.

11322. By James Westby on 2010-08-06

Remove the unused component from the parameters.

11323. By James Westby on 2010-08-12

Merged no-more-sampledata-2 into improve-makeDistroArchSeries.

11324. By James Westby on 2010-08-16

Merge no-more-sampledata-2 in to improve-makeDistroArchSeries.

Unmerged revisions

11324. By James Westby on 2010-08-16

Merge no-more-sampledata-2 in to improve-makeDistroArchSeries.

11323. By James Westby on 2010-08-12

Merged no-more-sampledata-2 into improve-makeDistroArchSeries.

11322. By James Westby on 2010-08-06

Remove the unused component from the parameters.

11321. By James Westby on 2010-08-06

Merged no-more-sampledata-2 into improve-makeDistroArchSeries.

11320. By James Westby on 2010-08-06

Merged no-more-sampledata-2 into improve-makeDistroArchSeries.

11319. By James Westby on 2010-08-05

This improves makeDistroArchSeries, having it create a ProcessorFamily.

It also drops a badly implemented and unused attribute from DistroArchSeries.

11318. By James Westby on 2010-08-05

Merged soyuz-factory-improvements into no-more-sampledata-2.

11317. By James Westby on 2010-08-05

Clean up lint.

11316. By James Westby on 2010-08-05

Fix a mistaken change.

11315. By James Westby on 2010-08-05

Undo the layer change as it is no longer needed.

=== modified file 'lib/lp/soyuz/interfaces/distroarchseries.py'
--- lib/lp/soyuz/interfaces/distroarchseries.py	2010-02-20 02:37:49 +0000
+++ lib/lp/soyuz/interfaces/distroarchseries.py	2010-08-16 22:09:54 +0000
@@ -74,9 +74,6 @@
                           "for building PPA packages."),
             required=False))
 
-    # Joins.
-    packages = Attribute('List of binary packages in this port.')
-
     # Page layouts helpers.
     title = exported(
         TextLine(

=== modified file 'lib/lp/soyuz/model/distroarchseries.py'
--- lib/lp/soyuz/model/distroarchseries.py	2010-08-10 05:10:16 +0000
+++ lib/lp/soyuz/model/distroarchseries.py	2010-08-16 22:09:54 +0000
@@ -62,11 +62,6 @@
     package_count = IntCol(notNull=True, default=DEFAULT)
     supports_virtualized = BoolCol(notNull=False, default=False)
 
-    packages = SQLRelatedJoin('BinaryPackageRelease',
-        joinColumn='distroarchseries',
-        intermediateTable='BinaryPackagePublishing',
-        otherColumn='binarypackagerelease')
-
     def __getitem__(self, name):
         return self.getBinaryPackage(name)
 

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2010-08-16 22:09:53 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2010-08-16 22:09:54 +0000
@@ -406,7 +406,7 @@
         status=PackagePublishingStatus.PENDING,
         pocket=PackagePublishingPocket.RELEASE,
         scheduleddeletiondate=None, dateremoved=None, section=None,
-        priority=None, component=None):
+        priority=None):
         """Return the corresponding BinaryPackagePublishingHistory."""
         distroarchseries = binarypackagerelease.build.distro_arch_series
 

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-08-16 22:09:53 +0000
+++ lib/lp/testing/factory.py	2010-08-16 22:09:54 +0000
@@ -1728,7 +1728,9 @@
         if distroseries is None:
             distroseries = self.makeDistroRelease()
         if processorfamily is None:
-            processorfamily = ProcessorFamilySet().getByName('powerpc')
+            processorfamily = self.makeProcessorFamily()
+        if not processorfamily.processors:
+            self.makeProcessor(family=processorfamily)
         if owner is None:
             owner = self.makePerson()
         if architecturetag is None:

=== modified file 'lib/lp/testing/tests/test_factory.py'
--- lib/lp/testing/tests/test_factory.py	2010-08-16 22:09:53 +0000
+++ lib/lp/testing/tests/test_factory.py	2010-08-16 22:09:54 +0000
@@ -26,6 +26,7 @@
 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageName
 from lp.soyuz.interfaces.binarypackagerelease import (
     BinaryPackageFileType, BinaryPackageFormat, IBinaryPackageRelease)
+from lp.soyuz.interfaces.distroarchseries import IDistroArchSeries
 from lp.soyuz.interfaces.files import (
     IBinaryPackageFile, ISourcePackageReleaseFile)
 from lp.soyuz.interfaces.publishing import (
@@ -339,6 +340,30 @@
         distribution = self.factory.makeDistribution()
         self.assertThat(distribution.displayname, StartsWith("Distribution"))
 
+    # makeDistroArchSeries
+    def test_makeDistroArchSeries_returns_proxied_IDistroArchSeries(self):
+        das = self.factory.makeDistroArchSeries()
+        self.assertThat(das, ProvidesAndIsProxied(IDistroArchSeries))
+
+    def test_makeDistroArchSeries_makes_ProcessorFamily(self):
+        das1 = self.factory.makeDistroArchSeries()
+        das2 = self.factory.makeDistroArchSeries()
+        self.assertNotEqual(das1.processorfamily, das2.processorfamily)
+
+    def test_makeDistroArchSeries_uses_processorfamily(self):
+        family = self.factory.makeProcessorFamily()
+        das = self.factory.makeDistroArchSeries(processorfamily=family)
+        self.assertEqual(family, das.processorfamily)
+
+    def test_makeDistroArchSeries_has_a_processor(self):
+        das = self.factory.makeDistroArchSeries()
+        self.assertNotEqual([], das.processorfamily.processors)
+
+    def test_makeDistroArchSeries_makes_a_processor_for_existing_family(self):
+        family = self.factory.makeProcessorFamily()
+        das = self.factory.makeDistroArchSeries(processorfamily=family)
+        self.assertNotEqual([], das.processorfamily.processors)
+
     # makeDistroRelease
     def test_makeDistroRelease_returns_IDistroSeries(self):
         distroseries = self.factory.makeDistroRelease()