Merge lp:~matsubara/launchpad/bug-553361-no-referrer into lp:launchpad

[Diogo Matsubara]

[r=bac] Fix bug 553361 by not logging an OOPS report when NoReferrerError is raised.

Fix bug 553361 by not logging an OOPS report when NoReferrerError is raised.

= QA =
To run the tests:
$ bin/test -u test_errorlog

[Brad Crittenden (bac)]

Hi Diogo,

The branch looks good. Please alphabetize the imports at line 23 of the diff.

review: Approve (code)

[Francis J. Lacoste (flacoste)]

Once that's QA on edge, I'd like this cherry-picked.

review: Approve (release-critical)

=== modified file 'lib/canonical/launchpad/webapp/errorlog.py'
--- lib/canonical/launchpad/webapp/errorlog.py	2009-11-26 21:25:17 +0000
+++ lib/canonical/launchpad/webapp/errorlog.py	2010-05-05 01:47:26 +0000
@@ -231,7 +231,7 @@
 
     _ignored_exceptions = set([
         'ReadOnlyModeDisallowedStore', 'ReadOnlyModeViolation',
-        'TranslationUnavailable'])
+        'TranslationUnavailable', 'NoReferrerError'])
     _ignored_exceptions_for_unauthenticated_users = set(['Unauthorized'])
     _default_config_section = 'error_reports'
 

=== modified file 'lib/canonical/launchpad/webapp/tests/test_errorlog.py'
--- lib/canonical/launchpad/webapp/tests/test_errorlog.py	2010-01-21 03:52:05 +0000
+++ lib/canonical/launchpad/webapp/tests/test_errorlog.py	2010-05-05 01:47:26 +0000
@@ -34,7 +34,8 @@
 from canonical.launchpad.webapp.errorlog import (
     ErrorReport, ErrorReportingUtility, OopsLoggingHandler, ScriptRequest,
     _is_sensitive)
-from canonical.launchpad.webapp.interfaces import TranslationUnavailable
+from canonical.launchpad.webapp.interfaces import (
+    NoReferrerError, TranslationUnavailable)
 from lazr.restful.declarations import webservice_error
 from lp.services.osutils import remove_tree
 from lp.testing import TestCase
@@ -693,6 +694,24 @@
         errorfile = os.path.join(utility.errordir(now), '01800.T1')
         self.assertFalse(os.path.exists(errorfile))
 
+    def test_raising_no_referrer_error(self):
+        """Test ErrorReportingUtility.raising() with a NoReferrerError
+        exception.
+
+        An OOPS is not recorded when a NoReferrerError exception is
+        raised.
+        """
+        utility = ErrorReportingUtility()
+        now = datetime.datetime(2006, 04, 01, 00, 30, 00, tzinfo=UTC)
+
+        try:
+            raise NoReferrerError('xyz')
+        except NoReferrerError:
+            utility.raising(sys.exc_info(), now=now)
+
+        errorfile = os.path.join(utility.errordir(now), '01800.T1')
+        self.assertFalse(os.path.exists(errorfile))
+
     def test_raising_with_string_as_traceback(self):
         # ErrorReportingUtility.raising() can be called with a string in the
         # place of a traceback. This is useful when the original traceback