Merge lp:~allenap/launchpad/mantis-no-return-path-exception-bug-227334-2 into lp:launchpad

[Gavin Panella]

[r=allenap][ui=none][bug=227334] Raise a BugTrackerConnectError in MantisLoginHandler instead of raising BugWatchUpdateWarning.

Changes the exception that comes out when Launchpad fails to log-in to a remote Mantis instance.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'lib/lp/bugs/doc/externalbugtracker-mantis-logging-in.txt'
--- lib/lp/bugs/doc/externalbugtracker-mantis-logging-in.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/doc/externalbugtracker-mantis-logging-in.txt	2011-01-20 23:23:56 +0000
@@ -1,10 +1,13 @@
-= Logging into a Mantis instance =
+Logging into a Mantis instance
+------------------------------
 
 Mantis is... special. In a headless/batch environment we must do a
 little dance in order to log in. Thankfully, we can encapsulate this
 neatly in a urllib2-style handler.
 
-== MantisLoginHandler ==
+
+MantisLoginHandler
+==================
 
     >>> from lp.bugs.externalbugtracker import (
     ...     MantisLoginHandler)
@@ -47,8 +50,9 @@
     ...     'http://mantis.example.com/login_page.php')
     Traceback (most recent call last):
       ...
-    BugWatchUpdateWarning: Mantis redirected us to the login page but
-    did not set a return path.
+    BugTrackerConnectError: http://mantis.example.com/login_page.php:
+    Mantis redirected us to the login page but did not set a return
+    path.
 
 In all likelihood, this warning will be followed in the log by an
 error.

=== modified file 'lib/lp/bugs/externalbugtracker/mantis.py'
--- lib/lp/bugs/externalbugtracker/mantis.py	2011-01-19 00:10:48 +0000
+++ lib/lp/bugs/externalbugtracker/mantis.py	2011-01-20 23:23:56 +0000
@@ -23,7 +23,6 @@
     BugNotFound,
     BugTrackerConnectError,
     BugWatchUpdateError,
-    BugWatchUpdateWarning,
     ExternalBugTracker,
     InvalidBugId,
     LookupTree,
@@ -50,10 +49,13 @@
            https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3301
 
       2. Mantis redirects us to:
-           .../alsa-bug/login_page.php?return=%2Falsa-bug%2Fview.php%3Fid%3D3301
+           .../alsa-bug/login_page.php?
+                 return=%2Falsa-bug%2Fview.php%3Fid%3D3301
 
       3. We notice this, rewrite the query, and skip to login.php:
-           .../alsa-bug/login.php?return=%2Falsa-bug%2Fview.php%3Fid%3D3301&username=guest&password=guest
+           .../alsa-bug/login.php?
+                 return=%2Falsa-bug%2Fview.php%3Fid%3D3301&
+                 username=guest&password=guest
 
       4. Mantis accepts our credentials then redirects us to the bug
          view page via a cookie test page (login_cookie_test.php)
@@ -73,9 +75,9 @@
             query = cgi.parse_qs(query, True)
             query['username'] = query['password'] = ['guest']
             if 'return' not in query:
-                raise BugWatchUpdateWarning(
-                    "Mantis redirected us to the login page "
-                    "but did not set a return path.")
+                raise BugTrackerConnectError(
+                    url, ("Mantis redirected us to the login page "
+                          "but did not set a return path."))
 
             query = urllib.urlencode(query, True)
             url = urlunparse(

=== modified file 'lib/lp/bugs/tests/test_bugtracker.py'
--- lib/lp/bugs/tests/test_bugtracker.py	2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/tests/test_bugtracker.py	2011-01-20 23:23:56 +0000
@@ -3,8 +3,6 @@
 
 __metaclass__ = type
 
-import unittest
-import transaction
 from datetime import (
     datetime,
     timedelta,
@@ -14,6 +12,7 @@
     ELLIPSIS,
     NORMALIZE_WHITESPACE,
     )
+import unittest
 from urllib2 import (
     HTTPError,
     Request,
@@ -21,12 +20,11 @@
 
 from lazr.lifecycle.snapshot import Snapshot
 from pytz import utc
-
+import transaction
 from zope.component import getUtility
 from zope.security.interfaces import Unauthorized
 from zope.security.proxy import removeSecurityProxy
 
-from canonical.launchpad.ftests import login_person
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.testing.layers import (
     DatabaseFunctionalLayer,
@@ -44,7 +42,11 @@
 from lp.bugs.model.bugtracker import BugTrackerSet
 from lp.bugs.tests.externalbugtracker import Urlib2TransportTestHandler
 from lp.registry.interfaces.person import IPersonSet
-from lp.testing import login, login_person, TestCaseWithFactory
+from lp.testing import (
+    login,
+    login_person,
+    TestCaseWithFactory,
+    )
 from lp.testing.sampledata import ADMIN_EMAIL