Merge lp:~adeuring/launchpad/expectations-bug-556499-model into lp:launchpad

Proposed by Abel Deuring
Status: Merged
Merged at revision: 10976
Proposed branch: lp:~adeuring/launchpad/expectations-bug-556499-model
Merge into: lp:launchpad
Diff against target: 421 lines (+199/-4)
16 files modified
lib/lp/bugs/doc/bug-reported-acknowledgement.txt (+122/-0)
lib/lp/bugs/interfaces/bugtarget.py (+10/-0)
lib/lp/registry/configure.zcml (+8/-3)
lib/lp/registry/interfaces/projectgroup.py (+10/-0)
lib/lp/registry/model/distribution.py (+1/-0)
lib/lp/registry/model/distributionsourcepackage.py (+22/-0)
lib/lp/registry/model/distroseries.py (+5/-0)
lib/lp/registry/model/product.py (+1/-0)
lib/lp/registry/model/productseries.py (+5/-0)
lib/lp/registry/model/projectgroup.py (+1/-0)
lib/lp/registry/model/sourcepackage.py (+5/-0)
lib/lp/registry/stories/webservice/xx-distribution-source-package.txt (+2/-1)
lib/lp/registry/stories/webservice/xx-distribution.txt (+1/-0)
lib/lp/registry/stories/webservice/xx-distroseries.txt (+1/-0)
lib/lp/registry/stories/webservice/xx-project-registry.txt (+4/-0)
lib/lp/registry/stories/webservice/xx-source-package.txt (+1/-0)
To merge this branch: bzr merge lp:~adeuring/launchpad/expectations-bug-556499-model
Reviewer Review Type Date Requested Status
Leonard Richardson (community) code Approve
Review via email: mp+27052@code.launchpad.net

Description of the change

This branch was originally written by intellectronica. He was not able to land it, so I ran ec2 test on it in order to get it merged.

This test run rsulted in a number of failures; most of them are webservice related: The new property bug_reported_acknowlegdement is webservice-exported, so it appears in a number of JSON representations of bug target objects.

Also, I added the still missing property lp.registry.model.DistributionSourcePackage.bug_reported_acknowlegdement.
I could not figure out a good test for it: doc/bug-reported-acknowledgement.txt already tested DSP.bug_reported_acknowlegdement -- but it obviously set only a simple object property but not a Storm column value.

tests: all the changed tests, and

./bin/test -t paches-view.txt

(this page test failed due to the missing property DSP.bug_reported_acknowlegdement)

no lint

The diff against Tom's lastest work:

=== modified file 'lib/lp/registry/model/distributionsourcepackage.py'
--- lib/lp/registry/model/distributionsourcepackage.py 2010-03-19 11:13:00 +0000
+++ lib/lp/registry/model/distributionsourcepackage.py 2010-06-08 13:27:12 +0000
@@ -147,6 +147,27 @@
         _get_bug_reporting_guidelines,
         _set_bug_reporting_guidelines)

+ def _get_bug_reported_acknowledgement(self):
+ """See `IBugTarget`."""
+ dsp_in_db = self._self_in_database
+ if dsp_in_db is not None:
+ return dsp_in_db.bug_reported_acknowledgement
+ return None
+
+ def _set_bug_reported_acknowledgement(self, value):
+ """See `IBugTarget`."""
+ dsp_in_db = self._self_in_database
+ if dsp_in_db is None:
+ dsp_in_db = DistributionSourcePackageInDatabase()
+ dsp_in_db.sourcepackagename = self.sourcepackagename
+ dsp_in_db.distribution = self.distribution
+ Store.of(self.distribution).add(dsp_in_db)
+ dsp_in_db.bug_reported_acknowledgement = value
+
+ bug_reported_acknowledgement = property(
+ _get_bug_reported_acknowledgement,
+ _set_bug_reported_acknowledgement)
+
     def _get_max_bug_heat(self):
         """See `IHasBugs`."""
         dsp_in_db = self._self_in_database
@@ -505,6 +526,7 @@
         sourcepackagename_id, 'SourcePackageName.id')

     bug_reporting_guidelines = Unicode()
+ bug_reported_acknowledgement = Unicode()

     max_bug_heat = Int()

=== modified file 'lib/lp/registry/stories/webservice/xx-distribution-source-package.txt'
--- lib/lp/registry/stories/webservice/xx-distribution-source-package.txt 2009-12-05 18:37:28 +0000
+++ lib/lp/registry/stories/webservice/xx-distribution-source-package.txt 2010-06-08 12:51:38 +0000
@@ -9,7 +9,8 @@
     ... name='mozilla-firefox').jsonBody()

     >>> print pretty(mozilla_firefox)
- {u'bug_reporting_guidelines': None,
+ {u'bug_reported_acknowledgement': None,
+ u'bug_reporting_guidelines': None,
      u'display_name': u'mozilla-firefox in debian',
      u'distribution_link': u'http://.../debian',
      u'http_etag': u'...',

=== modified file 'lib/lp/registry/stories/webservice/xx-distribution.txt'
--- lib/lp/registry/stories/webservice/xx-distribution.txt 2010-04-30 17:45:51 +0000
+++ lib/lp/registry/stories/webservice/xx-distribution.txt 2010-06-08 12:51:38 +0000
@@ -23,6 +23,7 @@
     all_milestones_collection_link: u'http://.../ubuntu/all_milestones'
     archive_mirrors_collection_link: u'http://.../ubuntu/archive_mirrors'
     archives_collection_link: u'http://.../ubuntu/archives'
+ bug_reported_acknowledgement: None
     bug_reporting_guidelines: None
     bug_supervisor_link: None
     cdimage_mirrors_collection_link: u'http://.../ubuntu/cdimage_mirrors'

=== modified file 'lib/lp/registry/stories/webservice/xx-distroseries.txt'
--- lib/lp/registry/stories/webservice/xx-distroseries.txt 2010-03-06 01:24:05 +0000
+++ lib/lp/registry/stories/webservice/xx-distroseries.txt 2010-06-08 12:51:38 +0000
@@ -60,6 +60,7 @@
     active_milestones_collection_link:
         u'http://.../ubuntu/hoary/active_milestones'
     all_milestones_collection_link: u'http://.../ubuntu/hoary/all_milestones'
+ bug_reported_acknowledgement: None
     bug_reporting_guidelines: None
     changeslist: <email address hidden>'
     date_created: u'2006-10-16T18:31:43.483559+00:00'

=== modified file 'lib/lp/registry/stories/webservice/xx-project-registry.txt'
--- lib/lp/registry/stories/webservice/xx-project-registry.txt 2010-05-07 18:18:56 +0000
+++ lib/lp/registry/stories/webservice/xx-project-registry.txt 2010-06-08 12:51:38 +0000
@@ -64,6 +64,7 @@
     active: True
     active_milestones_collection_link: u'http://.../mozilla/active_milestones'
     all_milestones_collection_link: u'http://.../mozilla/all_milestones'
+ bug_reported_acknowledgement: None
     bug_reporting_guidelines: None
     bug_tracker_link: None
     date_created: u'...'
@@ -150,6 +151,7 @@
     active_milestones_collection_link: u'http://.../firefox/active_milestones'
     all_milestones_collection_link: u'http://.../firefox/all_milestones'
     brand_link: u'http://.../firefox/brand'
+ bug_reported_acknowledgement: None
     bug_reporting_guidelines: None
     bug_supervisor_link: None
     bug_tracker_link: None
@@ -212,6 +214,7 @@
     active_milestones_collection_link: u'http://.../firefox/active_milestones'
     all_milestones_collection_link: u'http://.../firefox/all_milestones'
     brand_link: u'http://.../firefox/brand'
+ bug_reported_acknowledgement: None
     bug_reporting_guidelines: None
     bug_supervisor_link: None
     bug_tracker_link: None
@@ -861,6 +864,7 @@
     active_milestones_collection_link: u'http://.../babadoo/foobadoo/active_milestones'
     all_milestones_collection_link: u'http://.../babadoo/foobadoo/all_milestones'
     branch_link: u'http://.../~babadoo-owner/babadoo/fooey'
+ bug_reported_acknowledgement: None
     bug_reporting_guidelines: None
     date_created: u'...'
     display_name: u'foobadoo'

=== modified file 'lib/lp/registry/stories/webservice/xx-source-package.txt'
--- lib/lp/registry/stories/webservice/xx-source-package.txt 2010-03-02 15:30:18 +0000
+++ lib/lp/registry/stories/webservice/xx-source-package.txt 2010-06-08 12:51:38 +0000
@@ -29,6 +29,7 @@
     ... name='evolution').jsonBody()

     >>> pprint_entry(evolution)
+ bug_reported_acknowledgement: None
     bug_reporting_guidelines: None
     displayname: u'evolution in Ubuntu Hoary'
     distribution_link: u'http://.../ubuntu'

To post a comment you must log in.
Revision history for this message
Leonard Richardson (leonardr) wrote :

r=me on the changes on top of intellectronica's branch

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'lib/lp/bugs/doc/bug-reported-acknowledgement.txt'
2--- lib/lp/bugs/doc/bug-reported-acknowledgement.txt 1970-01-01 00:00:00 +0000
3+++ lib/lp/bugs/doc/bug-reported-acknowledgement.txt 2010-06-08 13:33:43 +0000
4@@ -0,0 +1,122 @@
5+= Bug Reported Acknowledgement Message =
6+
7+A message of acknowledgement to be displayed to bug reporters after they've
8+reported a bug can be set at the Distribution, DistributionSourcePackage,
9+ProjectGroup or Product level to help users file good bug reports, direct
10+them to FAQs, and so forth.
11+
12+ >>> login('foo.bar@canonical.com')
13+
14+ >>> from canonical.launchpad.interfaces import (
15+ ... IDistributionSet, IProjectGroupSet, IProductSet)
16+
17+ >>> distribution = getUtility(IDistributionSet).getByName('ubuntu')
18+ >>> distribution_source_package = (
19+ ... distribution.getSourcePackage('alsa-utils'))
20+ >>> project = getUtility(IProjectGroupSet).getByName('mozilla')
21+ >>> product = getUtility(IProductSet).getByName('firefox')
22+
23+ >>> settable_contexts = [
24+ ... distribution,
25+ ... distribution_source_package,
26+ ... project,
27+ ... product,
28+ ... ]
29+
30+ >>> for context in settable_contexts:
31+ ... context.bug_reported_acknowledgement = (
32+ ... "Bug reported on %s." % context.displayname)
33+
34+In fact, all IBugTargets have an acknowledgement message available, but the
35+others delegate to the distribution or product level.
36+
37+DistroSeries and SourcePackages defer to the Distribution:
38+
39+ >>> distro_series = distribution.getSeries('warty')
40+ >>> print distro_series.bug_reported_acknowledgement
41+ Bug reported on Ubuntu.
42+
43+ >>> source_package = distro_series.getSourcePackage('alsa-utils')
44+ >>> print source_package.bug_reported_acknowledgement
45+ Bug reported on Ubuntu.
46+
47+ProductSeries defer to the Product:
48+
49+ >>> product_series = product.getSeries('trunk')
50+ >>> print product_series.bug_reported_acknowledgement
51+ Bug reported on Mozilla Firefox.
52+
53+One day these objects that defer bug_reported_acknowledgement may have
54+their own message. In the meantime the deferral is done with a
55+read-only property, and the security proxies also only allow read
56+access.
57+
58+ >>> distro_series.bug_reported_acknowledgement = 'Foobar'
59+ Traceback (most recent call last):
60+ ...
61+ ForbiddenAttribute: ...
62+
63+ >>> source_package.bug_reported_acknowledgement = 'Foobar'
64+ Traceback (most recent call last):
65+ ...
66+ ForbiddenAttribute: ...
67+
68+ >>> product_series.bug_reported_acknowledgement = 'Foobar'
69+ Traceback (most recent call last):
70+ ...
71+ ForbiddenAttribute: ...
72+
73+The security proxies also prevent unprivileged users from editing the
74+message.
75+
76+ >>> from canonical.launchpad.interfaces import IPerson
77+
78+ >>> def check_access(user, context):
79+ ... if IPerson.providedBy(user):
80+ ... login_person(user)
81+ ... else:
82+ ... login(user)
83+ ... context.bug_reported_acknowledgement = (
84+ ... "%s let %s have access." % (
85+ ... context.displayname,
86+ ... getUtility(ILaunchBag).user.displayname))
87+ ... print context.bug_reported_acknowledgement
88+
89+ >>> check_access("no-priv@canonical.com", distribution)
90+ Traceback (most recent call last):
91+ ...
92+ Unauthorized: ...
93+
94+ >>> check_access("no-priv@canonical.com", distribution_source_package)
95+ Traceback (most recent call last):
96+ ...
97+ Unauthorized: ...
98+
99+ >>> check_access("no-priv@canonical.com", project)
100+ Traceback (most recent call last):
101+ ...
102+ Unauthorized: ...
103+
104+ >>> check_access("no-priv@canonical.com", product)
105+ Traceback (most recent call last):
106+ ...
107+ Unauthorized: ...
108+
109+Of course the owner can edit the message.
110+
111+ >>> check_access(distribution.owner.activemembers[0], distribution)
112+ Ubuntu let Alexander Limi have access.
113+
114+ >>> check_access(project.owner, project)
115+ the Mozilla Project let Sample Person have access.
116+
117+ >>> check_access(product.owner, product)
118+ Mozilla Firefox let Sample Person have access.
119+
120+In the case of DistributionSourcePackages, the owner of the
121+Distribution can edit the message.
122+
123+ >>> check_access(
124+ ... distribution_source_package.distribution.owner.activemembers[0],
125+ ... distribution_source_package)
126+ alsa-utils in ubuntu let Alexander Limi have access.
127
128=== modified file 'lib/lp/bugs/interfaces/bugtarget.py'
129--- lib/lp/bugs/interfaces/bugtarget.py 2010-06-07 18:09:00 +0000
130+++ lib/lp/bugs/interfaces/bugtarget.py 2010-06-08 13:33:43 +0000
131@@ -239,6 +239,16 @@
132 required=False,
133 max_length=50000))
134
135+ bug_reported_acknowledgement = exported(
136+ Text(
137+ title=(
138+ u"After reporting a bug, I can expect the following."),
139+ description=(
140+ u"This message of acknowledgement will be displayed "
141+ "to anyone after reporting a bug."),
142+ required=False,
143+ max_length=50000))
144+
145 def createBug(bug_params):
146 """Create a new bug on this target.
147
148
149=== modified file 'lib/lp/registry/configure.zcml'
150--- lib/lp/registry/configure.zcml 2010-05-17 09:35:18 +0000
151+++ lib/lp/registry/configure.zcml 2010-06-08 13:33:43 +0000
152@@ -380,6 +380,7 @@
153 publishing_history
154 current_publishing_records
155 bug_reporting_guidelines
156+ bug_reported_acknowledgement
157 latest_overall_publication
158 __getitem__
159 getVersion
160@@ -444,7 +445,9 @@
161 removeAnswerContact"/>
162 <require
163 permission="launchpad.Edit"
164- set_attributes="bug_reporting_guidelines"/>
165+ set_attributes="
166+ bug_reported_acknowledgement
167+ bug_reporting_guidelines"/>
168 </class>
169 <adapter
170 for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
171@@ -1086,7 +1089,8 @@
172 interface="lp.registry.interfaces.product.IProductEditRestricted"/>
173 <require
174 permission="launchpad.Edit"
175- set_attributes="bug_reporting_guidelines bugtracker
176+ set_attributes="bug_reporting_guidelines
177+ bug_reported_acknowledgement bugtracker
178 commercial_subscription description
179 development_focus displayname downloadurl
180 driver enable_bug_expiration
181@@ -1403,7 +1407,8 @@
182 displayname title summary description driver
183 members owner security_contact mirror_admin homepage_content
184 icon logo mugshot enable_bug_expiration
185- bug_reporting_guidelines official_blueprints official_malone
186+ bug_reporting_guidelines bug_reported_acknowledgement
187+ official_blueprints official_malone
188 official_rosetta official_answers official_bug_tags"/>
189 <require
190 permission="launchpad.TranslationsAdmin"
191
192=== modified file 'lib/lp/registry/interfaces/projectgroup.py'
193--- lib/lp/registry/interfaces/projectgroup.py 2010-04-19 08:30:06 +0000
194+++ lib/lp/registry/interfaces/projectgroup.py 2010-06-08 13:33:43 +0000
195@@ -261,6 +261,16 @@
196 required=False,
197 max_length=50000))
198
199+ bug_reported_acknowledgement = exported(
200+ Text(
201+ title=(
202+ u"After reporting a bug, I can expect the following."),
203+ description=(
204+ u"This message of acknowledgement will be displayed "
205+ "to anyone after reporting a bug."),
206+ required=False,
207+ max_length=50000))
208+
209 def getProduct(name):
210 """Get a product with name `name`."""
211
212
213=== modified file 'lib/lp/registry/model/distribution.py'
214--- lib/lp/registry/model/distribution.py 2010-05-27 17:20:07 +0000
215+++ lib/lp/registry/model/distribution.py 2010-06-08 13:33:43 +0000
216@@ -156,6 +156,7 @@
217 notNull=False,
218 default=None)
219 bug_reporting_guidelines = StringCol(default=None)
220+ bug_reported_acknowledgement = StringCol(default=None)
221 security_contact = ForeignKey(
222 dbName='security_contact', foreignKey='Person',
223 storm_validator=validate_public_person, notNull=False,
224
225=== modified file 'lib/lp/registry/model/distributionsourcepackage.py'
226--- lib/lp/registry/model/distributionsourcepackage.py 2010-03-19 11:13:00 +0000
227+++ lib/lp/registry/model/distributionsourcepackage.py 2010-06-08 13:33:43 +0000
228@@ -147,6 +147,27 @@
229 _get_bug_reporting_guidelines,
230 _set_bug_reporting_guidelines)
231
232+ def _get_bug_reported_acknowledgement(self):
233+ """See `IBugTarget`."""
234+ dsp_in_db = self._self_in_database
235+ if dsp_in_db is not None:
236+ return dsp_in_db.bug_reported_acknowledgement
237+ return None
238+
239+ def _set_bug_reported_acknowledgement(self, value):
240+ """See `IBugTarget`."""
241+ dsp_in_db = self._self_in_database
242+ if dsp_in_db is None:
243+ dsp_in_db = DistributionSourcePackageInDatabase()
244+ dsp_in_db.sourcepackagename = self.sourcepackagename
245+ dsp_in_db.distribution = self.distribution
246+ Store.of(self.distribution).add(dsp_in_db)
247+ dsp_in_db.bug_reported_acknowledgement = value
248+
249+ bug_reported_acknowledgement = property(
250+ _get_bug_reported_acknowledgement,
251+ _set_bug_reported_acknowledgement)
252+
253 def _get_max_bug_heat(self):
254 """See `IHasBugs`."""
255 dsp_in_db = self._self_in_database
256@@ -505,6 +526,7 @@
257 sourcepackagename_id, 'SourcePackageName.id')
258
259 bug_reporting_guidelines = Unicode()
260+ bug_reported_acknowledgement = Unicode()
261
262 max_bug_heat = Int()
263
264
265=== modified file 'lib/lp/registry/model/distroseries.py'
266--- lib/lp/registry/model/distroseries.py 2010-06-07 12:01:14 +0000
267+++ lib/lp/registry/model/distroseries.py 2010-06-08 13:33:43 +0000
268@@ -504,6 +504,11 @@
269 """See `IBugTarget`."""
270 return self.distribution.bug_reporting_guidelines
271
272+ @property
273+ def bug_reported_acknowledgement(self):
274+ """See `IBugTarget`."""
275+ return self.distribution.bug_reported_acknowledgement
276+
277 def _getMilestoneCondition(self):
278 """See `HasMilestonesMixin`."""
279 return (Milestone.distroseries == self)
280
281=== modified file 'lib/lp/registry/model/product.py'
282--- lib/lp/registry/model/product.py 2010-04-27 13:57:18 +0000
283+++ lib/lp/registry/model/product.py 2010-06-08 13:33:43 +0000
284@@ -288,6 +288,7 @@
285 foreignKey="ProductSeries", dbName="development_focus", notNull=False,
286 default=None)
287 bug_reporting_guidelines = StringCol(default=None)
288+ bug_reported_acknowledgement = StringCol(default=None)
289 _cached_licenses = None
290
291 def _validate_active(self, attr, value):
292
293=== modified file 'lib/lp/registry/model/productseries.py'
294--- lib/lp/registry/model/productseries.py 2010-06-03 16:08:33 +0000
295+++ lib/lp/registry/model/productseries.py 2010-06-08 13:33:43 +0000
296@@ -180,6 +180,11 @@
297 return self.product.bug_reporting_guidelines
298
299 @property
300+ def bug_reported_acknowledgement(self):
301+ """See `IBugTarget`."""
302+ return self.product.bug_reported_acknowledgement
303+
304+ @property
305 def sourcepackages(self):
306 """See IProductSeries"""
307 from lp.registry.model.sourcepackage import SourcePackage
308
309=== modified file 'lib/lp/registry/model/projectgroup.py'
310--- lib/lp/registry/model/projectgroup.py 2010-04-16 15:06:55 +0000
311+++ lib/lp/registry/model/projectgroup.py 2010-06-08 13:33:43 +0000
312@@ -123,6 +123,7 @@
313 foreignKey="BugTracker", dbName="bugtracker", notNull=False,
314 default=None)
315 bug_reporting_guidelines = StringCol(default=None)
316+ bug_reported_acknowledgement = StringCol(default=None)
317 max_bug_heat = Int()
318
319 # convenient joins
320
321=== modified file 'lib/lp/registry/model/sourcepackage.py'
322--- lib/lp/registry/model/sourcepackage.py 2010-06-07 12:01:14 +0000
323+++ lib/lp/registry/model/sourcepackage.py 2010-06-08 13:33:43 +0000
324@@ -425,6 +425,11 @@
325 """See `IBugTarget`."""
326 return self.distribution.bug_reporting_guidelines
327
328+ @property
329+ def bug_reported_acknowledgement(self):
330+ """See `IBugTarget`."""
331+ return self.distribution.bug_reported_acknowledgement
332+
333 def _customizeSearchParams(self, search_params):
334 """Customize `search_params` for this source package."""
335 search_params.setSourcePackage(self)
336
337=== modified file 'lib/lp/registry/stories/webservice/xx-distribution-source-package.txt'
338--- lib/lp/registry/stories/webservice/xx-distribution-source-package.txt 2009-12-05 18:37:28 +0000
339+++ lib/lp/registry/stories/webservice/xx-distribution-source-package.txt 2010-06-08 13:33:43 +0000
340@@ -9,7 +9,8 @@
341 ... name='mozilla-firefox').jsonBody()
342
343 >>> print pretty(mozilla_firefox)
344- {u'bug_reporting_guidelines': None,
345+ {u'bug_reported_acknowledgement': None,
346+ u'bug_reporting_guidelines': None,
347 u'display_name': u'mozilla-firefox in debian',
348 u'distribution_link': u'http://.../debian',
349 u'http_etag': u'...',
350
351=== modified file 'lib/lp/registry/stories/webservice/xx-distribution.txt'
352--- lib/lp/registry/stories/webservice/xx-distribution.txt 2010-05-14 08:05:23 +0000
353+++ lib/lp/registry/stories/webservice/xx-distribution.txt 2010-06-08 13:33:43 +0000
354@@ -23,6 +23,7 @@
355 all_milestones_collection_link: u'http://.../ubuntu/all_milestones'
356 archive_mirrors_collection_link: u'http://.../ubuntu/archive_mirrors'
357 archives_collection_link: u'http://.../ubuntu/archives'
358+ bug_reported_acknowledgement: None
359 bug_reporting_guidelines: None
360 bug_supervisor_link: None
361 cdimage_mirrors_collection_link: u'http://.../ubuntu/cdimage_mirrors'
362
363=== modified file 'lib/lp/registry/stories/webservice/xx-distroseries.txt'
364--- lib/lp/registry/stories/webservice/xx-distroseries.txt 2010-05-27 14:38:56 +0000
365+++ lib/lp/registry/stories/webservice/xx-distroseries.txt 2010-06-08 13:33:43 +0000
366@@ -61,6 +61,7 @@
367 active_milestones_collection_link:
368 u'http://.../ubuntu/hoary/active_milestones'
369 all_milestones_collection_link: u'http://.../ubuntu/hoary/all_milestones'
370+ bug_reported_acknowledgement: None
371 bug_reporting_guidelines: None
372 changeslist: u'hoary-changes@ubuntu.com'
373 date_created: u'2006-10-16T18:31:43.483559+00:00'
374
375=== modified file 'lib/lp/registry/stories/webservice/xx-project-registry.txt'
376--- lib/lp/registry/stories/webservice/xx-project-registry.txt 2010-05-27 14:38:56 +0000
377+++ lib/lp/registry/stories/webservice/xx-project-registry.txt 2010-06-08 13:33:43 +0000
378@@ -64,6 +64,7 @@
379 active: True
380 active_milestones_collection_link: u'http://.../mozilla/active_milestones'
381 all_milestones_collection_link: u'http://.../mozilla/all_milestones'
382+ bug_reported_acknowledgement: None
383 bug_reporting_guidelines: None
384 bug_tracker_link: None
385 date_created: u'...'
386@@ -150,6 +151,7 @@
387 active_milestones_collection_link: u'http://.../firefox/active_milestones'
388 all_milestones_collection_link: u'http://.../firefox/all_milestones'
389 brand_link: u'http://.../firefox/brand'
390+ bug_reported_acknowledgement: None
391 bug_reporting_guidelines: None
392 bug_supervisor_link: None
393 bug_tracker_link: None
394@@ -212,6 +214,7 @@
395 active_milestones_collection_link: u'http://.../firefox/active_milestones'
396 all_milestones_collection_link: u'http://.../firefox/all_milestones'
397 brand_link: u'http://.../firefox/brand'
398+ bug_reported_acknowledgement: None
399 bug_reporting_guidelines: None
400 bug_supervisor_link: None
401 bug_tracker_link: None
402@@ -863,6 +866,7 @@
403 all_milestones_collection_link:
404 u'http://.../babadoo/foobadoo/all_milestones'
405 branch_link: u'http://.../~babadoo-owner/babadoo/fooey'
406+ bug_reported_acknowledgement: None
407 bug_reporting_guidelines: None
408 date_created: u'...'
409 display_name: u'foobadoo'
410
411=== modified file 'lib/lp/registry/stories/webservice/xx-source-package.txt'
412--- lib/lp/registry/stories/webservice/xx-source-package.txt 2010-05-27 14:38:56 +0000
413+++ lib/lp/registry/stories/webservice/xx-source-package.txt 2010-06-08 13:33:43 +0000
414@@ -29,6 +29,7 @@
415 ... name='evolution').jsonBody()
416
417 >>> pprint_entry(evolution)
418+ bug_reported_acknowledgement: None
419 bug_reporting_guidelines: None
420 displayname: u'evolution in Ubuntu Hoary'
421 distribution_link: u'http://.../ubuntu'