← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~allenap/launchpad/trac-fixreleased-bug-667340 into lp:launchpad/devel

 

Gavin Panella has proposed merging lp:~allenap/launchpad/trac-fixreleased-bug-667340 into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #667340 Trac status of "Verified" confuses bug watcher
  https://bugs.launchpad.net/bugs/667340


Adds a new 'fixreleased' status mapping for Trac external bug trackers. Maps to 'Fix Released'.

Also fix an import in very-infrequently-used script generate-external-bug-status-docs.

-- 
https://code.launchpad.net/~allenap/launchpad/trac-fixreleased-bug-667340/+merge/40507
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/launchpad/trac-fixreleased-bug-667340 into lp:launchpad/devel.
=== modified file 'lib/lp/bugs/doc/externalbugtracker-trac.txt'
--- lib/lp/bugs/doc/externalbugtracker-trac.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/bugs/doc/externalbugtracker-trac.txt	2010-11-10 09:34:46 +0000
@@ -139,6 +139,8 @@
     'Confirmed'
     >>> trac.convertRemoteStatus('worksforme').title
     'Invalid'
+    >>> trac.convertRemoteStatus('fixverified').title
+    'Fix Released'
 
 If the status isn't one that our Trac ExternalBugTracker can understand
 an UnknownRemoteStatusError will be raised.

=== modified file 'lib/lp/bugs/externalbugtracker/trac.py'
--- lib/lp/bugs/externalbugtracker/trac.py	2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/externalbugtracker/trac.py	2010-11-10 09:34:46 +0000
@@ -274,7 +274,9 @@
         # XXX: 2007-08-06 Graham Binns:
         #      We should follow dupes if possible.
         ('accepted', 'assigned', 'duplicate', BugTaskStatus.CONFIRMED),
-        ('fixed', 'closed', BugTaskStatus.FIXRELEASED),
+        # Status fixverified added for bug 667340, for http://trac.yorba.org/,
+        # but could be generally useful so adding here.
+        ('fixed', 'closed', 'fixverified', BugTaskStatus.FIXRELEASED),
         ('invalid', 'worksforme', BugTaskStatus.INVALID),
         ('wontfix', BugTaskStatus.WONTFIX),
         )

=== modified file 'utilities/generate-external-bug-status-docs'
--- utilities/generate-external-bug-status-docs	2010-04-27 19:48:39 +0000
+++ utilities/generate-external-bug-status-docs	2010-11-10 09:34:46 +0000
@@ -27,8 +27,7 @@
 from itertools import chain
 from optparse import OptionParser
 
-from canonical.launchpad.components.externalbugtracker import (
-    BUG_TRACKER_CLASSES)
+from lp.bugs.externalbugtracker import BUG_TRACKER_CLASSES
 
 
 def generate_blank_lines(num):