Merge lp:~rvb/launchpad/sync-bug-827608-populate-ancestor-redone into lp:launchpad

[Raphaël Badin]

Populate the SourcePackagePublishingHistory's ancestor column when the new spph is created by being copied over.

This is exactly the same MP as the one that has been approved: https://code.launchpad.net/~rvb/launchpad/sync-bug-827608-populate-ancestor/+merge/74737. This was reverted as part of a 4 branches revert ... and only the 2 last branches should have been reverted.

[Gavin Panella (allenap)]

Rubber-stamped after conversation in #launchpad-redsquad.

review: Approve

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2011-09-23 08:00:31 +0000
+++ lib/lp/soyuz/model/publishing.py	2011-09-23 08:00:31 +0000
@@ -814,7 +814,7 @@
             component,
             section,
             pocket,
-            ancestor=None,
+            ancestor=self,
             create_dsd_job=create_dsd_job,
             creator=creator)
 

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2011-09-23 08:00:31 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2011-09-23 08:00:31 +0000
@@ -1012,6 +1012,15 @@
         # Section has no default so it comes from the old publication.
         self.assertEqual(spph.section, copy.section)
 
+    def test_copyTo_sets_ancestor(self):
+        # SPPH's ancestor get's populated when a spph is copied over.
+        target_archive = self.factory.makeArchive()
+        spph = self.factory.makeSourcePackagePublishingHistory()
+        copy = spph.copyTo(
+            spph.distroseries, spph.pocket, target_archive)
+
+        self.assertEqual(spph, copy.ancestor)
+
 
 class BuildRecordCreationTests(TestNativePublishingBase):
     """Test the creation of build records."""