Merge lp:~salgado/launchpad/use-master-store into lp:launchpad

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

When doing my previous changes to make sure the master database is used
when looking up Account/Person entries in OpenIDCallbackView.render() I
didn't realize the login() call would trigger other DB lookups, so left
it out of the with: block that runs with the MasterDatabasePolicy
installed.

That mistake is the cause of OOPS-1521ED286. This branch fixes it

[Tim Penhey (thumper)]

Looks fine.

review: Approve (release-critical)

=== modified file 'lib/canonical/launchpad/webapp/login.py'
--- lib/canonical/launchpad/webapp/login.py	2010-02-26 22:05:40 +0000
+++ lib/canonical/launchpad/webapp/login.py	2010-03-01 19:36:23 +0000
@@ -307,8 +307,8 @@
                     removeSecurityProxy(account).createPerson(
                         PersonCreationRationale.OWNER_CREATED_LAUNCHPAD)
                     should_update_last_write = True
+                self.login(account)
 
-            self.login(account)
             if should_update_last_write:
                 # This is a GET request but we changed the database, so update
                 # session_data['last_write'] to make sure further requests use

=== modified file 'lib/canonical/launchpad/webapp/tests/test_login.py'
--- lib/canonical/launchpad/webapp/tests/test_login.py	2010-02-26 22:07:54 +0000
+++ lib/canonical/launchpad/webapp/tests/test_login.py	2010-03-01 19:36:23 +0000
@@ -56,6 +56,10 @@
     def login(self, account):
         super(StubbedOpenIDCallbackView, self).login(account)
         self.login_called = True
+        current_policy = getUtility(IStoreSelector).get_current()
+        if not isinstance(current_policy, MasterDatabasePolicy):
+            raise AssertionError(
+                "Not using the master store: %s" % current_policy)
 
 
 @contextmanager