Launchpad itself

Code review comment for lp:~michael.nelson/launchpad/distro-series-difference-basic-model

  1. distro-series-difference-basic-model
  2. Merge into db-devel
Revision history for this message
Michael Nelson (michael.nelson) wrote :

On Fri, Aug 27, 2010 at 1:39 PM, Abel Deuring
<email address hidden> wrote:
> Review: Approve code
> Hi Michael,
>
> nice work! I have just two nitpicks:

Thanks Abel, incremental attached. In addition to the changes you
mentioned, I've switched the activity_log to be a property rather than
a db field due to a schema change.

Cheers,
Michael

changes_adeuring.diff
1=== modified file 'lib/lp/registry/interfaces/distroseriesdifference.py'
2--- lib/lp/registry/interfaces/distroseriesdifference.py 2010-08-27 09:28:03 +0000
3+++ lib/lp/registry/interfaces/distroseriesdifference.py 2010-08-27 12:29:55 +0000
4@@ -54,7 +54,7 @@
5 "The most recently generated package diff for this difference."))
6
7 activity_log = Text(
8- title=_('A log of activity and comments for this difference'),
9+ title=_('A log of activity and comments for this difference.'),
10 required=False, readonly=True)
11
12 status = Choice(
13
14=== modified file 'lib/lp/registry/model/distroseriesdifference.py'
15--- lib/lp/registry/model/distroseriesdifference.py 2010-08-27 09:02:40 +0000
16+++ lib/lp/registry/model/distroseriesdifference.py 2010-08-27 12:38:58 +0000
17@@ -56,7 +56,6 @@
18 last_package_diff = Reference(
19 last_package_diff_id, 'PackageDiff.id')
20
21- activity_log = Unicode(name='activity_log', allow_none=True)
22 status = DBEnum(name='status', allow_none=False,
23 enum=DistroSeriesDifferenceStatus)
24 difference_type = DBEnum(name='difference_type', allow_none=False,
25@@ -88,6 +87,11 @@
26 """See `IDistroSeriesDifference`."""
27 return self._getLatestSourcePub(for_parent=True)
28
29+ @property
30+ def activity_log(self):
31+ """See `IDistroSeriesDifference`."""
32+ return u""
33+
34 def _getLatestSourcePub(self, for_parent=False):
35 """Helper to keep source_pub/parent_source_pub DRY."""
36 distro_series = self.derived_series
37
38=== modified file 'lib/lp/registry/tests/test_distroseriesdifference.py'
39--- lib/lp/registry/tests/test_distroseriesdifference.py 2010-08-27 09:02:40 +0000
40+++ lib/lp/registry/tests/test_distroseriesdifference.py 2010-08-27 12:37:35 +0000
41@@ -44,10 +44,15 @@
42 # A DistroSeriesDifference cannot be created with a non-derived
43 # series.
44 distro_series = self.factory.makeDistroSeries()
45+ source_package_name = self.factory.makeSourcePackageName('myfoo')
46+ distroseriesdifference_factory = getUtility(
47+ IDistroSeriesDifferenceSource)
48+
49 self.assertRaises(
50- NotADerivedSeriesError,
51- self.factory.makeDistroSeriesDifference,
52- derived_series=distro_series)
53+ NotADerivedSeriesError, distroseriesdifference_factory.new,
54+ distro_series, source_package_name,
55+ DistroSeriesDifferenceType.UNIQUE_TO_DERIVED_SERIES
56+ )
57
58 def test_source_pub(self):
59 # The related source pub is returned for the derived series.

« Back to merge proposal