Merge lp:~bryce/launchpad/lp-31745-237126-617102 into lp:launchpad

[Bryce Harrington]

[bug=31745][bug=237126][bug=617102][ui=none][r=] Improve mapping of unusual Bugzilla statuses and resolutions to more appropriate Launchpad status values.

This fixes three bugs relating to the mapping of bugzilla statuses to Launchpad statuses.
(LP: #31745, #237126, #617102).

Different bugzilla instances sometimes add custom statuses and resolutions beyond the defaults; we have tracked some of these, this branch adds several more.

We also recently added an Expired status to Launchpad. This branch takes advantage of this by mapping a few relevant Bugzilla resolutions to it.

For situations where the bug was closed with an unrecognized resolution, we had been mapping those unknown resolutions to be status 'Invalid'. Instead, this branch explicitly maps resolutions that *should* be invalid to Invalid, and any other unknown resolutions map to status 'Unknown'.

I've tested this using 'test -t bugzilla' and run it successfully through ec2 test.
I've done a lint check and verified this branch adds no new lint errors.

[Deryck Hodge (deryck)]

review: Approve (code)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-bugzilla.txt'
--- lib/lp/bugs/doc/externalbugtracker-bugzilla.txt	2010-08-13 20:33:45 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bugzilla.txt	2010-08-24 16:34:41 +0000
@@ -290,6 +290,8 @@
     'Fix Committed'
     >>> external_bugzilla.convertRemoteStatus('RESOLVED FIXED').title
     'Fix Released'
+    >>> external_bugzilla.convertRemoteStatus('RESOLVED UPSTREAM').title
+    "Won't Fix"
     >>> external_bugzilla.convertRemoteStatus(
     ...     'CLOSED PATCH_ALREADY_AVAILABLE').title
     'Fix Released'
@@ -300,7 +302,7 @@
     >>> external_bugzilla.convertRemoteStatus('CLOSED INVALID').title
     'Invalid'
     >>> external_bugzilla.convertRemoteStatus('CLOSED UPSTREAM').title
-    'Fix Released'
+    "Won't Fix"
 
 If the status can't be converted an UnknownRemoteStatusError will be
 returned.

=== modified file 'lib/lp/bugs/externalbugtracker/bugzilla.py'
--- lib/lp/bugs/externalbugtracker/bugzilla.py	2010-08-21 07:31:45 +0000
+++ lib/lp/bugs/externalbugtracker/bugzilla.py	2010-08-24 16:34:41 +0000
@@ -254,6 +254,7 @@
         ('ASSIGNED', 'ON_DEV', 'FAILS_QA', 'STARTED',
          BugTaskStatus.INPROGRESS),
         ('NEEDINFO', 'NEEDINFO_REPORTER', 'WAITING', 'SUSPENDED',
+         'PLEASETEST',
          BugTaskStatus.INCOMPLETE),
         ('PENDINGUPLOAD', 'MODIFIED', 'RELEASE_PENDING', 'ON_QA',
          BugTaskStatus.FIXCOMMITTED),
@@ -261,11 +262,19 @@
         ('RESOLVED', 'VERIFIED', 'CLOSED',
             LookupTree(
                 ('CODE_FIX', 'CURRENTRELEASE', 'ERRATA', 'NEXTRELEASE',
-                 'PATCH_ALREADY_AVAILABLE', 'FIXED', 'RAWHIDE', 'UPSTREAM',
+                 'PATCH_ALREADY_AVAILABLE', 'FIXED', 'RAWHIDE',
+                 'DOCUMENTED',
                  BugTaskStatus.FIXRELEASED),
-                ('WONTFIX', BugTaskStatus.WONTFIX),
-                (BugTaskStatus.INVALID, ))),
-        ('REOPENED', 'NEW', 'UPSTREAM', 'DEFERRED', BugTaskStatus.CONFIRMED),
+                ('WONTFIX', 'WILL_NOT_FIX', 'NOTOURBUG', 'UPSTREAM',
+                 BugTaskStatus.WONTFIX),
+                ('OBSOLETE', 'INSUFFICIENT_DATA', 'INCOMPLETE', 'EXPIRED',
+                 BugTaskStatus.EXPIRED),
+                ('INVALID', 'WORKSFORME', 'NOTABUG', 'CANTFIX',
+                 'UNREPRODUCIBLE',
+                 BugTaskStatus.INVALID),
+                (BugTaskStatus.UNKNOWN,))),
+        ('REOPENED', 'NEW', 'UPSTREAM', 'DEFERRED',
+         BugTaskStatus.CONFIRMED),
         ('UNCONFIRMED', BugTaskStatus.NEW),
         )