Merge lp:~michael.nelson/launchpad/db-test-fix-timebomb into lp:launchpad/db-devel

Proposed by Michael Nelson
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~michael.nelson/launchpad/db-test-fix-timebomb
Merge into: lp:launchpad/db-devel
Diff against target: 36 lines (+9/-5)
1 file modified
lib/lp/registry/stories/milestone/object-milestones.txt (+9/-5)
To merge this branch: bzr merge lp:~michael.nelson/launchpad/db-test-fix-timebomb
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+22595@code.launchpad.net

Description of the change

Don't check the actual dates when printing milestones.

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

One review change per IRC: don't mask the dates with "..." because it might hide an entire line of output. Thanks for implementing that!

review: Approve
Revision history for this message
Michael Nelson (michael.nelson) wrote :

r9187 (which is still not appearing) is http://pastebin.ubuntu.com/407482/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/registry/stories/milestone/object-milestones.txt'
--- lib/lp/registry/stories/milestone/object-milestones.txt 2009-11-26 03:06:58 +0000
+++ lib/lp/registry/stories/milestone/object-milestones.txt 2010-04-01 09:14:27 +0000
@@ -11,6 +11,10 @@
11 ... return None11 ... return None
12 ... result = []12 ... result = []
13 ... for tr in table.findAll('tr'):13 ... for tr in table.findAll('tr'):
14 ... milestone_date = tr.find('span')
15 ... if len(milestone_date.contents) > 0:
16 ... # Just make sure we don't print an actual date.
17 ... milestone_date.contents[0].replaceWith('A date')
14 ... result.append(extract_text(tr))18 ... result.append(extract_text(tr))
15 ... return '\n'.join(result)19 ... return '\n'.join(result)
1620
@@ -68,7 +72,7 @@
68 Mozilla Firefox 0.9.2 "One (secure) Tree Hill" trunk None ...72 Mozilla Firefox 0.9.2 "One (secure) Tree Hill" trunk None ...
69 Mozilla Firefox 0.9.1 "One Tree Hill (v2)" trunk None ...73 Mozilla Firefox 0.9.1 "One Tree Hill (v2)" trunk None ...
70 Mozilla Firefox 0.9 "One Tree Hill" trunk None ...74 Mozilla Firefox 0.9 "One Tree Hill" trunk None ...
71 Mozilla Firefox 1.0 trunk 2056-10-1675 Mozilla Firefox 1.0 trunk A date
72 not yet released76 not yet released
7377
74When the project is a member of a project group, the the user can see a link78When the project is a member of a project group, the the user can see a link
@@ -112,10 +116,10 @@
112 >>> print all_milestones(anon_browser)116 >>> print all_milestones(anon_browser)
113 GNOME 2.1.6 None This is an inactive milestone117 GNOME 2.1.6 None This is an inactive milestone
114 GNOME 1.0 None This is an inactive milestone118 GNOME 1.0 None This is an inactive milestone
115 GNOME 1.3 2012-04-01 This is an inactive milestone119 GNOME 1.3 A date This is an inactive milestone
116 GNOME 1.2 2011-04-01 not yet released120 GNOME 1.2 A date not yet released
117 GNOME 1.1. 2010-04-02 not yet released121 GNOME 1.1. A date not yet released
118 GNOME 1.1 2010-04-01 not yet released Bugs targeted: 3 Confirmed122 GNOME 1.1 A date not yet released Bugs targeted: 3 Confirmed
119 Blueprints targeted: 2 Unknown123 Blueprints targeted: 2 Unknown
120124
121125

Subscribers

People subscribed via source and target branches

to status/vote changes: