Merge lp:~bac/launchpad/bug-987499 into lp:launchpad

[Brad Crittenden]

Set LaunchBag.developer to False in lp.testing.logout().

= Summary =

LaunchBag.developer is being assumed to be unset when it can be left
on by previous tests. Clear it explicitly.

== Proposed fix ==

In the test, explicitly turn off the flag.

Alternatively, a tearDown method can be added to TestCase to ensure it
is always reset to False at the end of a run.

Similarly, a ILoggedOutEvent could be sent.

This flag is rarely used so I chose to not muddy the test
infrastructure to deal with it.

== Pre-implementation notes ==

None

== Implementation details ==

== Tests ==

Set tests.txt to:
lp.registry.browser.tests.test_subscription_links.DistroMilestoneView.test_subscribe_link_admin
lp.app.browser.tests.test_stringformatter.TestOOPSFormatter.test_doesnt_linkify_for_non_developers

bin/test -vv --load-list tests.txt

== Demo and Q/A ==

None

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/app/browser/tests/test_stringformatter.py

[Gary Poster (gary)]

Cool, thank you.

I verified in IRC that the test_stringformatter change is just for test clarity: it does not change behavior. The behavior change is in _login.

Thank you!

review: Approve

[j.c.sackett (jcsackett)]

Looks good. Thanks, Brad.

review: Approve

=== modified file 'lib/lp/app/browser/tests/test_stringformatter.py'
--- lib/lp/app/browser/tests/test_stringformatter.py	2012-04-02 05:42:19 +0000
+++ lib/lp/app/browser/tests/test_stringformatter.py	2012-05-03 20:32:18 +0000
@@ -373,6 +373,11 @@
 
     layer = DatabaseFunctionalLayer
 
+    def _setDeveloper(self, value):
+        """Override ILaunchBag.developer for testing purposes."""
+        launch_bag = getUtility(ILaunchBag)
+        launch_bag.setDeveloper(value)
+
     def test_doesnt_linkify_for_non_developers(self):
         # OOPS IDs won't be linkified for non-developers.
         oops_id = 'OOPS-12345TEST'
@@ -384,17 +389,11 @@
             "Formatted string should be '%s', was '%s'" % (
                 oops_id, formatted_string))
 
-    def _setDeveloper(self):
-        """Override ILaunchBag.developer for testing purposes."""
-        launch_bag = getUtility(ILaunchBag)
-        launch_bag.setDeveloper(True)
-
     def test_linkifies_for_developers(self):
         # OOPS IDs will be linkified for Launchpad developers.
         oops_id = 'OOPS-12345TEST'
         formatter = FormattersAPI(oops_id)
-
-        self._setDeveloper()
+        self._setDeveloper(True)
         formatted_string = formatter.oops_id()
 
         expected_string = '<a href="%s">%s</a>' % (

=== modified file 'lib/lp/testing/_login.py'
--- lib/lp/testing/_login.py	2012-04-03 15:09:11 +0000
+++ lib/lp/testing/_login.py	2012-05-03 20:32:18 +0000
@@ -37,6 +37,7 @@
     setupInteractionByEmail,
     setupInteractionForPerson,
     )
+from lp.services.webapp.interfaces import ILaunchBag
 from lp.services.webapp.servers import LaunchpadTestRequest
 from lp.services.webapp.vhosts import allvhosts
 from lp.testing.sampledata import ADMIN_EMAIL
@@ -135,6 +136,8 @@
     LaunchpadFunctionalTestCase's tearDown method so
     you generally won't need to call this.
     """
+    # Ensure the launchbag developer flag is off when logging out.
+    getUtility(ILaunchBag).setDeveloper(False)
     endInteraction()