Merge lp:~al-maisan/launchpad/relsets-463195 into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

The branch at hand enables a user to find related package sets. The added IPackageset.relatedSets() method returns (for a given package set P) a collection of package sets to which P is related by way of a shared package set group.

Tests to run:

    bin/test -vvt packageset

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2009-10-13 14:46:17 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2009-10-29 14:30:26 +0000
@@ -277,6 +277,8 @@
     IPackageset, 'getSourcesSharedBy', 'other_package_set', IPackageset)
 patch_plain_parameter_type(
     IPackageset, 'getSourcesNotSharedBy', 'other_package_set', IPackageset)
+patch_collection_return_type(
+    IPackageset, 'relatedSets', IPackageset)
 
 # IPackageUpload
 IPackageUpload['pocket'].vocabulary = PackagePublishingPocket
 
=== modified file 'lib/lp/soyuz/interfaces/packageset.py'
--- lib/lp/soyuz/interfaces/packageset.py	2009-10-27 23:40:24 +0000
+++ lib/lp/soyuz/interfaces/packageset.py	2009-10-29 14:30:26 +0000
@@ -217,6 +217,16 @@
             names.
         """
 
+    @operation_returns_collection_of(Interface)
+    @export_read_operation()
+    def relatedSets():
+        """Get all package sets related to this one.
+
+        Return all package sets that are related to this one.
+
+        :return: A (potentially empty) sequence of `IPackageset` instances.
+        """
+
 
 class IPackagesetEdit(Interface):
     """A writeable interface for package sets."""
 
=== modified file 'lib/lp/soyuz/model/packageset.py'
--- lib/lp/soyuz/model/packageset.py	2009-10-27 15:42:04 +0000
+++ lib/lp/soyuz/model/packageset.py	2009-10-29 14:30:26 +0000
@@ -295,6 +295,15 @@
         clauses = (Packageset, In(Packageset.name, names))
         self._api_add_or_remove(clauses, self._removeDirectSuccessors)
 
+    def relatedSets(self):
+        """See `IPackageset`."""
+        store = IStore(Packageset)
+        result_set = store.find(
+            Packageset,
+            Packageset.packagesetgroup == self.packagesetgroup,
+            Packageset.id != self.id)
+        return _order_result_set(result_set)
+
 
 class PackagesetSet:
     """See `IPackagesetSet`."""
 
=== modified file 'lib/lp/soyuz/tests/test_packageset.py'
--- lib/lp/soyuz/tests/test_packageset.py	2009-10-27 22:27:52 +0000
+++ lib/lp/soyuz/tests/test_packageset.py	2009-10-29 14:30:26 +0000
@@ -14,13 +14,13 @@
     DuplicatePackagesetName, IPackagesetSet)
 
 
-class TestPackagesetSetNew(TestCaseWithFactory):
+class TestPackagesetSet(TestCaseWithFactory):
 
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
         """Setup a distribution with multiple distroseries."""
-        super(TestPackagesetSetNew, self).setUp()
+        super(TestPackagesetSet, self).setUp()
         self.distribution = getUtility(IDistributionSet).getByName(
             'ubuntu')
         self.distroseries_current = self.distribution.currentseries
@@ -119,3 +119,69 @@
         pset_found = getUtility(IPackagesetSet).getByName(
             'kernel', distroseries=self.distroseries_experimental)
         self.assertEqual(pset2, pset_found)
+
+
+class TestPackageset(TestCaseWithFactory):
+
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        """Setup a distribution with multiple distroseries."""
+        super(TestPackageset, self).setUp()
+        self.distribution = getUtility(IDistributionSet).getByName(
+            'ubuntu')
+        self.distroseries_current = self.distribution.currentseries
+        self.distroseries_experimental = self.factory.makeDistroRelease(
+            distribution = self.distribution, name="experimental",
+            status=DistroSeriesStatus.EXPERIMENTAL)
+        self.distroseries_experimental2 = self.factory.makeDistroRelease(
+            distribution = self.distribution, name="experimental2",
+            status=DistroSeriesStatus.EXPERIMENTAL)
+
+        self.person1 = self.factory.makePerson(
+            name='hacker', displayname=u'Happy Hacker')
+
+        self.packageset_set = getUtility(IPackagesetSet)
+
+    def test_no_related_sets(self):
+        # If the package set is the only one in the group the result set
+        # returned by relatedSets() is empty.
+        packageset = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1)
+
+        self.failUnlessEqual(packageset.relatedSets().count(), 0)
+
+    def test_related_set_found(self):
+        # Creating a new package set while specifying a `related_set` should
+        # have the effect that the former ends up in the same group as the
+        # latter.
+
+        # The original package set.
+        pset1 = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1)
+
+        # A related package set.
+        pset2 = self.packageset_set.new(
+            u'kernel', u'A related package set.', self.person1,
+            distroseries=self.distroseries_experimental, related_set=pset1)
+        self.assertEqual(pset1.packagesetgroup, pset2.packagesetgroup)
+
+        # An unrelated package set with the same name.
+        pset3 = self.packageset_set.new(
+            u'kernel', u'Unrelated package set.', self.person1,
+            distroseries=self.distroseries_experimental2)
+        self.assertNotEqual(pset2.packagesetgroup, pset3.packagesetgroup)
+
+        # Make sure 'pset2' is related to 'pset1'.
+        related = pset1.relatedSets()
+        self.assertEqual(related.count(), 1)
+        self.assertEqual(related[0], pset2)
+
+        # And the other way around ..
+        related = pset2.relatedSets()
+        self.assertEqual(related.count(), 1)
+        self.assertEqual(related[0], pset1)
+
+        # Unsurprisingly, the unrelated package set is not associated with any
+        # other package set.
+        self.failUnlessEqual(pset3.relatedSets().count(), 0)