launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/launchpad/testfix-post-conflict into lp:launchpad/db-devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/launchpad/testfix-post-conflict/+merge/60981

Resolve semantic devel/db-devel conflict left over after resolving text conflict.

The problem was with the late-added requirements for the derived-distro work: while my test created a derived distroseries using the parent_series attribute in devel, others were working on the new requirement for multi-parent distroseries.  The test distroseries is now made derived through a DistroSeriesParent record instead.

== Tests ==

{{{
./bin/test -vvc lp.soyuz.browser.tests.test_package_copying_mixin
}}}


= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/soyuz/browser/tests/test_package_copying_mixin.py
-- 
https://code.launchpad.net/~jtv/launchpad/testfix-post-conflict/+merge/60981
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/launchpad/testfix-post-conflict into lp:launchpad/db-devel.

=== modified file 'lib/lp/soyuz/browser/tests/test_package_copying_mixin.py'
--- lib/lp/soyuz/browser/tests/test_package_copying_mixin.py	2011-05-13 08:49:32 +0000
+++ lib/lp/soyuz/browser/tests/test_package_copying_mixin.py	2011-05-14 06:18:27 +0000
@@ -223,10 +223,13 @@
 
     def makeDerivedSeries(self):
         """Create a derived `DistroSeries`, quickly."""
-        series = self.makeDistroSeries(parent_series=self.makeDistroSeries())
+        parent_series = self.makeDistroSeries()
+        derived_series = self.makeDistroSeries()
+        self.factory.makeDistroSeriesParent(
+            parent_series=parent_series, derived_series=derived_series)
         getUtility(ISourcePackageFormatSelectionSet).add(
-            series, SourcePackageFormat.FORMAT_1_0)
-        return series
+            derived_series, SourcePackageFormat.FORMAT_1_0)
+        return derived_series
 
     def makeView(self):
         """Create a `PackageCopyingMixin`-based view."""