Merge lp:~canonical-isd-hackers/canonical-identity-provider/speed-up-tests into lp:canonical-identity-provider/release

[Łukasz Czyżykowski]

Speed up for test suite.

Overview
========
This branch speeds up the test suite. On my machine it goes from 700 seconds down to ~400.

Details
=======
It was mostly accomplished by switching from django.tests.TransactionTestCase to django.tests.TestCase and fixing the cases when that change have broken.

[Ricardo Kirkner (ricardokirkner)]

Nice refactoring.

review: Approve

=== modified file 'identityprovider/tests/functional/helpers.py'
--- identityprovider/tests/functional/helpers.py	2011-05-31 15:19:26 +0000
+++ identityprovider/tests/functional/helpers.py	2011-07-19 13:59:31 +0000
@@ -5,7 +5,7 @@
 from wsgi_intercept.zope_testbrowser import WSGI_Browser
 
 from identityprovider.models.openidmodels import OpenIDRPConfig
-from identityprovider.tests.utils import SQLCachedTestCase
+from identityprovider.tests.utils import SSOBaseTestCase
 
 
 class DuplicateIdError(Exception):
@@ -28,7 +28,7 @@
             'Found %d elements with id %r' % (len(elements_with_id), id))
 
 
-class FunctionalTestCase(SQLCachedTestCase):
+class FunctionalTestCase(SSOBaseTestCase):
     functional = True
     fixtures = ['test']
     urls = 'identityprovider.tests.functional.urls'

=== modified file 'identityprovider/tests/test_admin.py'
--- identityprovider/tests/test_admin.py	2011-06-29 21:29:09 +0000
+++ identityprovider/tests/test_admin.py	2011-07-19 13:59:31 +0000
@@ -13,13 +13,12 @@
 from identityprovider.models.const import EmailStatus
 from identityprovider.utils import validate_launchpad_password
 
-from utils import BasicAccountTestCase
-
-
-class AdminTestCase(BasicAccountTestCase):
-
-    fixtures = ['admin.json', 'test.json']
-    pgsql_functions = ['generate_openid_identifier']
+from .utils import SSOBaseTestCase
+
+
+class AdminTestCase(SSOBaseTestCase):
+
+    fixtures = ['admin', 'test']
 
     def setUp(self):
         self.disable_csrf()

=== modified file 'identityprovider/tests/test_auth.py'
--- identityprovider/tests/test_auth.py	2011-05-30 15:35:36 +0000
+++ identityprovider/tests/test_auth.py	2011-07-19 13:59:31 +0000
@@ -13,15 +13,15 @@
 from identityprovider.models.account import Account
 from identityprovider.models.const import AccountStatus, EmailStatus
 from identityprovider.models.emailaddress import EmailAddress
-from identityprovider.tests.utils import BasicAccountTestCase
 from identityprovider.auth import (
     LaunchpadBackend,
     SSOOAuthAuthentication,
     oauth_authenticate,
 )
-
-
-class LaunchpadBackendTestCase(BasicAccountTestCase):
+from .utils import SSOBaseTestCase
+
+
+class LaunchpadBackendTestCase(SSOBaseTestCase):
 
     fixtures = ["test"]
 
@@ -153,7 +153,8 @@
         self.assertFalse(response)
 
 
-class SSOOAuthAuthenticationTestCase(BasicAccountTestCase):
+class SSOOAuthAuthenticationTestCase(SSOBaseTestCase):
+
     def setUp(self):
         self.auth = SSOOAuthAuthentication()
         # create a valid request

=== modified file 'identityprovider/tests/test_backend_base.py'
--- identityprovider/tests/test_backend_base.py	2011-05-11 15:29:56 +0000
+++ identityprovider/tests/test_backend_base.py	2011-07-19 13:59:31 +0000
@@ -10,8 +10,9 @@
     DatabaseWrapper as PostgresDatabaseWrapper)
 from django.test import TestCase
 
-from identityprovider.backend.base import (AuthUserCache, CursorReadOnlyWrapper,
-    DatabaseError, DatabaseWrapper, BaseCache, DjangoSessionCache)
+from identityprovider.backend.base import (
+    AuthUserCache, CursorReadOnlyWrapper, DatabaseError, DatabaseWrapper,
+    BaseCache, DjangoSessionCache)
 from identityprovider.readonly import ReadOnlyManager
 from identityprovider.utils import is_django_13
 from identityprovider.tests.mockdb import MockCursor
@@ -56,18 +57,17 @@
 
 class DjangoSessionCacheTestCase(TestCase):
 
-   def test_update(self):
-       mock = MockCursor("value")
-       match = re.match(
-           CursorReadOnlyWrapper.command_patterns['update'],
-           'UPDATE "t" SET "session_data" = %s, "expire_date" = %s '
-           'WHERE "django_session"."session_key" = %s'
-       )
-       django_session_cache = DjangoSessionCache()
-       django_session_cache.update(match, ["a", "b", "c"], mock)
+    def test_update(self):
+        mock = MockCursor("value")
+        match = re.match(
+            CursorReadOnlyWrapper.command_patterns['update'],
+            'UPDATE "t" SET "session_data" = %s, "expire_date" = %s '
+            'WHERE "django_session"."session_key" = %s')
+        django_session_cache = DjangoSessionCache()
+        django_session_cache.update(match, ["a", "b", "c"], mock)
 
-       value = cache.get(django_session_cache.cache_key("c"))
-       self.assertEquals(value, "[['c', 'a', 'b']]")
+        value = cache.get(django_session_cache.cache_key("c"))
+        self.assertEquals(value, "[['c', 'a', 'b']]")
 
 
 class CursorReadOnlyWrapperTestCase(TestCase):

=== modified file 'identityprovider/tests/test_captcha.py'
--- identityprovider/tests/test_captcha.py	2011-06-23 08:23:12 +0000
+++ identityprovider/tests/test_captcha.py	2011-07-19 13:59:31 +0000
@@ -17,7 +17,8 @@
 
     def __enter__(self):
         for setting, new_value in self.kwargs.items():
-            self.old_settings[setting] = getattr(settings, setting, self.marker)
+            old_value = getattr(settings, setting, self.marker)
+            self.old_settings[setting] = old_value
             setattr(settings, setting, new_value)
 
     def __exit__(self, exc_type, exc_val, exc_tb):

=== modified file 'identityprovider/tests/test_command_cleanup.py'
--- identityprovider/tests/test_command_cleanup.py	2011-06-15 16:36:56 +0000
+++ identityprovider/tests/test_command_cleanup.py	2011-07-19 13:59:31 +0000
@@ -16,9 +16,9 @@
 class CleanupCommandTestCase(TestCase):
     def tearDown(self):
         cursor = connection.cursor()
-        cursor.execute("""TRUNCATE lp_openididentifier, account, accountpassword,
-            emailaddress, lp_person, django_session, openidnonce,
-            openidassociation CASCADE""")
+        cursor.execute("""TRUNCATE lp_openididentifier, account,
+            accountpassword, emailaddress, lp_person, django_session,
+            openidnonce, openidassociation CASCADE""")
         connection.connection.commit()
 
     setUp = tearDown

=== modified file 'identityprovider/tests/test_command_populate.py'
--- identityprovider/tests/test_command_populate.py	2010-12-20 18:21:33 +0000
+++ identityprovider/tests/test_command_populate.py	2011-07-19 13:59:31 +0000
@@ -6,12 +6,13 @@
 from identityprovider.models import (Account, AccountPassword, EmailAddress,
     Person, LPOpenIdIdentifier, OpenIDAssociation, OpenIDNonce)
 
+
 class PopulateCommandTestCase(TestCase):
     def tearDown(self):
         cursor = connection.cursor()
-        cursor.execute("""TRUNCATE lp_openididentifier, account, accountpassword,
-            emailaddress, lp_person, django_session, openidnonce,
-            openidassociation CASCADE""")
+        cursor.execute("""TRUNCATE lp_openididentifier, account,
+            accountpassword, emailaddress, lp_person, django_session,
+            openidnonce, openidassociation CASCADE""")
         connection.connection.commit()
 
     setUp = tearDown

=== modified file 'identityprovider/tests/test_command_readonly.py'
--- identityprovider/tests/test_command_readonly.py	2010-07-12 13:41:07 +0000
+++ identityprovider/tests/test_command_readonly.py	2011-07-19 13:59:31 +0000
@@ -14,11 +14,11 @@
     remove_wsgi_intercept)
 
 from identityprovider.readonly import ReadOnlyManager
-from identityprovider.tests.utils import SQLCachedTestCase
-
-
-class ReadonlyCommandTestCase(SQLCachedTestCase):
-    pgsql_functions = ['generate_openid_identifier']
+
+from .utils import SSOBaseTestCase
+
+
+class ReadonlyCommandTestCase(SSOBaseTestCase):
 
     def setUp(self):
         self.rm = ReadOnlyManager()
@@ -34,8 +34,7 @@
                         {'SERVER_ID': 'otherhost',
                          'HOST': 'localhost',
                          'PORT': '8001',
-                        }
-                       ]
+                        }]
         self._APP_SERVERS = settings.APP_SERVERS
         settings.APP_SERVERS = self.servers
         self._DBFAILOVER_FLAG_DIR = getattr(settings, 'DBFAILOVER_FLAG_DIR',

=== modified file 'identityprovider/tests/test_command_sqlcachedflush.py'
--- identityprovider/tests/test_command_sqlcachedflush.py	2010-05-27 22:46:47 +0000
+++ identityprovider/tests/test_command_sqlcachedflush.py	2011-07-19 13:59:31 +0000
@@ -8,7 +8,7 @@
 from django.conf import settings
 from django.core.management import call_command
 
-from identityprovider.tests.utils import SQLCachedTestCase
+from identityprovider.tests.utils import SSOBaseTestCase
 
 
 class Alarm(Exception):
@@ -19,7 +19,8 @@
     raise Alarm
 
 
-class SQLCachedFlushCommandTestCase(SQLCachedTestCase):
+class SQLCachedFlushCommandTestCase(SSOBaseTestCase):
+
     def setUp(self):
         # set alarm handler
         self.old_signal = signal.signal(signal.SIGALRM, alarm_handler)

=== modified file 'identityprovider/tests/test_dbfailover.py'
--- identityprovider/tests/test_dbfailover.py	2011-05-24 20:00:24 +0000
+++ identityprovider/tests/test_dbfailover.py	2011-07-19 13:59:31 +0000
@@ -9,11 +9,12 @@
 from django.conf import settings
 from django.db import connection
 
-from identityprovider.tests.utils import SQLCachedTestCase
 from identityprovider.branding import current_brand
 from identityprovider.tests import mockdb
+from identityprovider.tests.utils import SSOBaseTestCase
 from identityprovider.readonly import ReadOnlyManager
 
+
 test_db_connections = [
     {
          'DATABASE_ID': 'testmaster',
@@ -34,8 +35,7 @@
 ]
 
 
-class FailoverTestCase(SQLCachedTestCase):
-    pgsql_functions = ['generate_openid_identifier']
+class FailoverTestCase(SSOBaseTestCase):
 
     def __init__(self, methodName='runTest'):
         super(FailoverTestCase, self).__init__(methodName)

=== modified file 'identityprovider/tests/test_fields.py'
--- identityprovider/tests/test_fields.py	2011-05-24 19:28:51 +0000
+++ identityprovider/tests/test_fields.py	2011-07-19 13:59:31 +0000
@@ -121,7 +121,6 @@
                 forms.ValidationError, otp_field.clean, otp)
 
 
-
 class OneTimePaswordFieldWithMockServerTestCase(WSGIInterceptedTestCase):
 
     def setUp(self):

=== modified file 'identityprovider/tests/test_forms.py'
--- identityprovider/tests/test_forms.py	2011-07-11 21:05:24 +0000
+++ identityprovider/tests/test_forms.py	2011-07-19 13:59:31 +0000
@@ -19,10 +19,12 @@
 from identityprovider.api10.forms import WebserviceCreateAccountForm
 from identityprovider.models.openidmodels import OpenIDRPConfig
 
-from utils import BasicAccountTestCase, SQLCachedTestCase
-
-
-class EditAccountFormTest(BasicAccountTestCase):
+from .utils import SSOBaseTestCase
+
+
+class EditAccountFormTest(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def test_initial_displayname(self):
         account = Account.objects.get(openid_identifier='name12_oid')
@@ -79,7 +81,7 @@
         self.assertEqual(0, len(form.non_field_errors()))
 
 
-class WebServiceCreateAccountFormTest(SQLCachedTestCase):
+class WebServiceCreateAccountFormTest(SSOBaseTestCase):
 
     def setUp(self):
         self.old_dcv = settings.DISABLE_CAPTCHA_VERIFICATION
@@ -125,7 +127,7 @@
         self.assertEqual(form.cleaned_data['validate_redirect_to'], None)
 
 
-class ResetPasswordFormTest(SQLCachedTestCase):
+class ResetPasswordFormTest(SSOBaseTestCase):
 
     def test_nonascii_password(self):
         data = {'password': 'Ñandú'}
@@ -135,8 +137,7 @@
                          'Invalid characters in password')
 
 
-class SRegRequestFormTest(SQLCachedTestCase):
-    pgsql_functions = ['generate_openid_identifier']
+class SRegRequestFormTest(SSOBaseTestCase):
 
     def _get_request_with_post_args(self, args={}):
         request = HttpRequest()
@@ -269,7 +270,7 @@
         self.assertTrue(form.check_test('email'))
 
 
-class TeamsRequestFormTest(BasicAccountTestCase):
+class TeamsRequestFormTest(SSOBaseTestCase):
 
     fixtures = ["test"]
 
@@ -381,7 +382,7 @@
         self.assertFalse(form2.check_test('ubuntu-team'))
 
 
-class TokenForrmTest(SQLCachedTestCase):
+class TokenForrmTest(SSOBaseTestCase):
 
     def test_confirmation_code_error(self):
         data = {'confirmation_code': 'BOGUS', 'email': '[e-mail]'}

=== modified file 'identityprovider/tests/test_handlers.py'
--- identityprovider/tests/test_handlers.py	2011-07-11 14:33:55 +0000
+++ identityprovider/tests/test_handlers.py	2011-07-19 13:59:31 +0000
@@ -3,7 +3,7 @@
 from django.utils import simplejson
 from mock import patch
 
-from identityprovider.tests.utils import SQLCachedTestCase
+from identityprovider.tests.utils import SSOBaseTestCase
 from identityprovider.models import (
     Account,
     APIUser,
@@ -31,7 +31,7 @@
         self.data = data
         self.environ = {'REMOTE_ADDR': '127.0.0.1'}
 
-class RegistrationHandlerTestCase(SQLCachedTestCase):
+class RegistrationHandlerTestCase(SSOBaseTestCase):
 
     fixtures = ["test"]
     pgsql_functions = ["generate_openid_identifier"]
@@ -237,7 +237,7 @@
             displayname='', password='the_password')
 
 
-class AuthenticationTestCase(SQLCachedTestCase):
+class AuthenticationTestCase(SSOBaseTestCase):
 
     fixtures = ["test"]
 

=== modified file 'identityprovider/tests/test_language_selection.py'
--- identityprovider/tests/test_language_selection.py	2010-05-13 12:50:22 +0000
+++ identityprovider/tests/test_language_selection.py	2011-07-19 13:59:31 +0000
@@ -1,7 +1,7 @@
-from identityprovider.tests.utils import BasicAccountTestCase
-
-
-class SelectLanguagePageTestCase(BasicAccountTestCase):
+from identityprovider.tests.utils import SSOBaseTestCase
+
+
+class SelectLanguagePageTestCase(SSOBaseTestCase):
 
     def setUp(self):
         self.client.login(username='[e-mail]', password='test')

=== modified file 'identityprovider/tests/test_loginservice.py'
--- identityprovider/tests/test_loginservice.py	2010-10-01 11:50:37 +0000
+++ identityprovider/tests/test_loginservice.py	2011-07-19 13:59:31 +0000
@@ -5,10 +5,11 @@
 
 from identityprovider.branding import current_brand
 from identityprovider.models.authtoken import AuthToken
-from utils import BasicAccountTestCase, SQLCachedTestCase
-
-
-class LoginTest(SQLCachedTestCase):
+
+from .utils import SSOBaseTestCase
+
+
+class LoginTest(SSOBaseTestCase):
 
     def test_loginform_password_did_not_match_error(self):
         r = self.client.post('/+login', {'email': "[e-mail]",
@@ -25,7 +26,7 @@
         self.assertFormError(r, 'form', 'password', "Required field.")
 
 
-class NewAccountTest(BasicAccountTestCase):
+class NewAccountTest(SSOBaseTestCase):
 
     def test_newaccount_existing(self):
         query = {
@@ -38,7 +39,9 @@
         self.assertEquals(len(mail.outbox), 0)
 
 
-class ForgottenPasswordTest(BasicAccountTestCase):
+class ForgottenPasswordTest(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def test_forgottenpass_nonexisting(self):
         query = {
@@ -70,3 +73,4 @@
         mail.outbox = []
 
         AuthToken.objects.all().delete()
+

=== modified file 'identityprovider/tests/test_middleware.py'
--- identityprovider/tests/test_middleware.py	2011-07-08 13:37:36 +0000
+++ identityprovider/tests/test_middleware.py	2011-07-19 13:59:31 +0000
@@ -7,18 +7,20 @@
 
 import django
 from django.conf import settings
+from django.test import TestCase
 from django.contrib.auth.models import User, AnonymousUser
 
-from openid.message import (IDENTIFIER_SELECT, OPENID1_URL_LIMIT, OPENID2_NS)
+from openid.message import IDENTIFIER_SELECT, OPENID1_URL_LIMIT, OPENID2_NS
 
-from identityprovider.tests.utils import (BasicAccountTestCase, MockRequest,
-    TestCase)
+from identityprovider.tests.utils import MockRequest, TestCase
 from identityprovider.models import Account, EmailAddress, OpenIDRPConfig
 from identityprovider.middleware.exception import LogExceptionMiddleware
 from identityprovider.middleware.useraccount import (
     UserAccountConversionMiddleware)
 from identityprovider.utils import is_django_13
 
+from .utils import SSOBaseTestCase
+
 
 def _extract_csrf_token(response):
     csrf_field = re.search('<input [^>]*name=[\'"]csrfmiddlewaretoken[\'"]'
@@ -27,8 +29,7 @@
                                     csrf_field.group()).group(1)
 
 
-
-class UserAccountConversionMiddlewareTestCase(BasicAccountTestCase):
+class UserAccountConversionMiddlewareTestCase(SSOBaseTestCase):
 
     fixtures = ['test']
 
@@ -156,7 +157,7 @@
 
 # The CSRF middleware requires a session cookie in order to activate.
 # The tests perform a login in order to acquire this session cookie.
-class CSRFMiddlewareTestCase(BasicAccountTestCase):
+class CSRFMiddlewareTestCase(SSOBaseTestCase):
 
     fixtures = ['test']
 

=== modified file 'identityprovider/tests/test_models_account.py'
--- identityprovider/tests/test_models_account.py	2011-07-15 12:29:59 +0000
+++ identityprovider/tests/test_models_account.py	2011-07-19 13:59:31 +0000
@@ -2,12 +2,13 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 from datetime import datetime, timedelta
+
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.test import TestCase
 
 from oauth_backend.models import Consumer
 
-from identityprovider.tests.utils import BasicAccountTestCase
 from identityprovider.models.account import (Account, AccountPassword,
     AccountStatus)
 from identityprovider.models import account as a
@@ -16,6 +17,8 @@
 from identityprovider.readonly import ReadOnlyManager
 from identityprovider.utils import encrypt_launchpad_password, generate_salt
 
+from .utils import SSOBaseTestCase
+
 
 class MockBackend(object):
 
@@ -29,7 +32,7 @@
         return self.value
 
 
-class AccountTestCase(BasicAccountTestCase):
+class AccountTestCase(SSOBaseTestCase):
 
     fixtures = ["test"]
 
@@ -331,23 +334,22 @@
         self.assertEqual(sites_count, 1)
 
 
-class AccountPasswordTestCase(BasicAccountTestCase):
+class AccountPasswordTestCase(TestCase):
+
     def test_unicode(self):
         account = Account(openid_identifier='oid', displayname='displayname')
         password = AccountPassword(account=account, password='password')
         self.assertEqual(unicode(password), u'Password for displayname')
 
 
-class CreateOAuthTokenForAccountTestCase(BasicAccountTestCase):
+class CreateOAuthTokenForAccountTestCase(SSOBaseTestCase):
 
     def setUp(self):
         self.account = Account.objects.create_account(
-            'test', '[e-mail]', 'password'
-        )
+            'test', '[e-mail]', 'password')
         self.user = User.objects.create_user(
             self.account.openid_identifier,
-            '[e-mail]', 'password'
-        )
+            '[e-mail]', 'password')
 
     def test_when_account_has_associated_consumer(self):
         consumer, _ = Consumer.objects.get_or_create(user=self.user)

=== modified file 'identityprovider/tests/test_models_api.py'
--- identityprovider/tests/test_models_api.py	2011-02-20 23:49:21 +0000
+++ identityprovider/tests/test_models_api.py	2011-07-19 13:59:31 +0000
@@ -5,11 +5,13 @@
 from identityprovider.models.emailaddress import EmailAddress
 from identityprovider.models.const import EmailStatus
 from identityprovider.models.api import APIUser
-from identityprovider.tests.utils import SQLCachedTestCase
 from identityprovider.utils import encrypt_launchpad_password, generate_salt
 
-
-class APIUserTestCase(SQLCachedTestCase):
+from .utils import SSOBaseTestCase
+
+
+class APIUserTestCase(SSOBaseTestCase):
+
     def setUp(self):
         super(APIUserTestCase, self).setUp()
 

=== modified file 'identityprovider/tests/test_models_authtoken.py'
--- identityprovider/tests/test_models_authtoken.py	2011-07-12 21:42:47 +0000
+++ identityprovider/tests/test_models_authtoken.py	2011-07-19 13:59:31 +0000
@@ -9,13 +9,14 @@
     patch,
 )
 
-from identityprovider.tests.utils import BasicAccountTestCase
 from identityprovider.models.account import Account
 from identityprovider.models import authtoken
 from identityprovider.models.authtoken import (AuthToken, AuthTokenFactory,
     send_validation_email_request, create_unique_token_for_table, valid_email)
 from identityprovider.models.const import EmailStatus, LoginTokenType
 
+from .utils import SSOBaseTestCase
+
 
 class MockRenderToString(object):
 
@@ -30,7 +31,10 @@
         return self.return_value
 
 
-class AuthTokenTestCase(BasicAccountTestCase):
+class AuthTokenTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
+
     def setUp(self):
         def mock_send_email(self, from_name, subject, message):
             self.message = message

=== modified file 'identityprovider/tests/test_models_emailaddress.py'
--- identityprovider/tests/test_models_emailaddress.py	2010-05-07 20:29:41 +0000
+++ identityprovider/tests/test_models_emailaddress.py	2011-07-19 13:59:31 +0000
@@ -1,8 +1,8 @@
 from identityprovider.models import Account, EmailAddress, Person
-from identityprovider.tests.utils import BasicAccountTestCase
-
-
-class EmailAddressTestCase(BasicAccountTestCase):
+from identityprovider.tests.utils import SSOBaseTestCase
+
+
+class EmailAddressTestCase(SSOBaseTestCase):
     fixtures = ['test']
 
     def test_emailaddress_with_account_and_person(self):

=== modified file 'identityprovider/tests/test_models_openidmodels.py'
--- identityprovider/tests/test_models_openidmodels.py	2011-06-29 21:29:09 +0000
+++ identityprovider/tests/test_models_openidmodels.py	2011-07-19 13:59:31 +0000
@@ -12,11 +12,11 @@
 from identityprovider.models.openidmodels import (DjangoOpenIDStore,
     OpenIDAssociation, OpenIDAuthorization, OpenIDNonce, OpenIDRPConfig,
     OpenIDRPSummary)
+from identityprovider.tests.utils import SSOBaseTestCase
 from identityprovider.readonly import ReadOnlyManager
-from identityprovider.tests.utils import BasicAccountTestCase
-
-
-class DjangoOpenIDStoreTestCase(BasicAccountTestCase):
+
+
+class DjangoOpenIDStoreTestCase(SSOBaseTestCase):
 
     def setUp(self):
         self.server_url = 'http://server.example.com'
@@ -117,7 +117,7 @@
         self.assertEqual(OpenIDAssociation.objects.all().count(), 0)
 
 
-class OpenIDRPConfigTestCase(BasicAccountTestCase):
+class OpenIDRPConfigTestCase(SSOBaseTestCase):
 
     def setUp(self):
         self.rp_config = OpenIDRPConfig()
@@ -138,7 +138,7 @@
         self.assertEqual(unicode(self.rp_config), u'MyOpenIDRPConfig')
 
 
-class OpenIDAssociationTestCase(BasicAccountTestCase):
+class OpenIDAssociationTestCase(SSOBaseTestCase):
     fixtures = ['multiple_associations']
 
     def test_create_association(self):
@@ -151,7 +151,10 @@
             issued=time(), lifetime=1000, assoc_type='HMAC-SHA1')
 
 
-class OpenIDAuthorizationTestCase(BasicAccountTestCase):
+class OpenIDAuthorizationTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
+    
     def setUp(self):
         self.account = Account.objects.get_by_email('[e-mail]')
         self.trust_root = 'http://openid.launchpad.dev'
@@ -218,7 +221,10 @@
             self.trust_root, 'client'))
 
 
-class OpenIDRPSummaryTestCase(BasicAccountTestCase):
+class OpenIDRPSummaryTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
+
     approved_data = {
         'test1': {'one': [1, 2], 'two': [2, 3]},
         'test2': {'three': [3, 4], 'four': [4, 5]}}

=== modified file 'identityprovider/tests/test_models_person.py'
--- identityprovider/tests/test_models_person.py	2010-12-20 16:19:03 +0000
+++ identityprovider/tests/test_models_person.py	2011-07-19 13:59:31 +0000
@@ -7,10 +7,10 @@
     AccountStatus)
 from identityprovider.models.person import Person
 from identityprovider.models.team import TeamParticipation
-from identityprovider.tests.utils import SQLCachedTestCase
-
-
-class PersonTestCase(SQLCachedTestCase):
+from identityprovider.tests.utils import SSOBaseTestCase
+
+
+class PersonTestCase(SSOBaseTestCase):
 
     pgsql_functions = ['generate_openid_identifier']
 

=== modified file 'identityprovider/tests/test_models_team.py'
--- identityprovider/tests/test_models_team.py	2011-07-01 19:47:04 +0000
+++ identityprovider/tests/test_models_team.py	2011-07-19 13:59:31 +0000
@@ -11,13 +11,12 @@
     TeamMembership,
     TeamParticipation,
 )
-from identityprovider.tests.utils import (
-    BasicAccountTestCase,
-    SQLCachedTestCase,
-)
-
-
-class TeamParticipationTestCase(SQLCachedTestCase):
+
+from .utils import SSOBaseTestCase
+
+
+class TeamParticipationTestCase(SSOBaseTestCase):
+
     def test_unicode(self):
         team = Person.objects.create(displayname='Team', name='team')
         person = Person.objects.create(displayname='Person', name='person')
@@ -25,7 +24,7 @@
         self.assertEqual(unicode(tp), u'Person in Team')
 
 
-class TeamMembershipTest(BasicAccountTestCase):
+class TeamMembershipTest(SSOBaseTestCase):
 
     fixtures = ["test"]
 

=== modified file 'identityprovider/tests/test_readonly.py'
--- identityprovider/tests/test_readonly.py	2011-07-08 13:37:36 +0000
+++ identityprovider/tests/test_readonly.py	2011-07-19 13:59:31 +0000
@@ -14,14 +14,14 @@
 from django.utils import simplejson
 
 from identityprovider.readonly import ReadOnlyManager
-from identityprovider.tests.utils import SQLCachedTestCase, BasicAccountTestCase
 from identityprovider import models
 from identityprovider.backend.base import DatabaseError
 from identityprovider.views.readonly import (_remote_req, get_server_atts,
     update_server)
-
-
-class InReadOnlyTestCase(SQLCachedTestCase):
+from identityprovider.tests.utils import SSOBaseTestCase
+
+
+class InReadOnlyTestCase(SSOBaseTestCase):
 
     def setUp(self):
         self.rm = ReadOnlyManager()
@@ -72,7 +72,7 @@
         settings.DATABASE_ID = old_DATABASE_ID
 
 
-class RemoteRequestTest(SQLCachedTestCase):
+class RemoteRequestTest(SSOBaseTestCase):
     msg = 'hello'
     host = 'myhost'
     scheme = 'https'
@@ -130,7 +130,7 @@
         self.restore_orig_urlopen()
 
 
-class ReadOnlyBackUp(SQLCachedTestCase):
+class ReadOnlyBackUp(SSOBaseTestCase):
     """A base TestCase for backing up and restoring our readonly settings"""
     pgsql_functions = ['generate_openid_identifier']
 
@@ -338,8 +338,7 @@
         self.assertTrue(data['readonly'])
 
 
-class ReadOnlyViewsTestCase(ReadOnlyBackUp, BasicAccountTestCase):
-    pgsql_functions = ['generate_openid_identifier']
+class ReadOnlyViewsTestCase(ReadOnlyBackUp):
 
     def login_with_staff(self):
         user = User.objects.create(username='admin')
@@ -528,8 +527,6 @@
 
 class ReadOnlyViews(InReadOnlyTestCase):
 
-    pgsql_functions = ['generate_openid_identifier']
-
     def test_new_account_is_rendered_using_read_only_template(self):
         settings.READ_ONLY_MODE = True
         r = self.client.get('/+new_account')

=== modified file 'identityprovider/tests/test_static.py'
--- identityprovider/tests/test_static.py	2010-10-27 18:18:48 +0000
+++ identityprovider/tests/test_static.py	2011-07-19 13:59:31 +0000
@@ -7,15 +7,14 @@
 
 import identityprovider.branding
 import identityprovider.context_processors
-from identityprovider.tests.utils import BasicAccountTestCase, SQLCachedTestCase
+from identityprovider.tests.utils import SSOBaseTestCase
 
 
 class DummyRequest(object):
     META = {}
 
 
-class BrandingTestCase(SQLCachedTestCase):
-    pgsql_functions = ['generate_openid_identifier']
+class BrandingTestCase(SSOBaseTestCase):
 
     def setUp(self):
         self.BRAND = settings.BRAND
@@ -52,8 +51,9 @@
         self.assertContains(response, 'recognised by Launchpad')
 
 
-class StaticPageTestCase(BasicAccountTestCase):
-    pgsql_functions = ['generate_openid_identifier']
+class StaticPageTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def setUp(self):
         self.brand = settings.BRAND

=== modified file 'identityprovider/tests/test_teams.py'
--- identityprovider/tests/test_teams.py	2010-05-18 19:37:59 +0000
+++ identityprovider/tests/test_teams.py	2011-07-19 13:59:31 +0000
@@ -7,11 +7,12 @@
 
 from identityprovider.teams import (supportsTeams, getTeamsNS, ns_uri,
     TeamsNamespaceError, TeamsRequest, TeamsResponse)
-from identityprovider.tests.utils import SQLCachedTestCase
+from identityprovider.tests.utils import SSOBaseTestCase
 from identityprovider.views import server
 
 
-class TeamsTestCase(SQLCachedTestCase):
+class TeamsTestCase(SSOBaseTestCase):
+
     def test_supportsTeams(self):
         endpoint = OpenIDServiceEndpoint()
         endpoint.type_uris.append(ns_uri)
@@ -24,7 +25,7 @@
         self.assertFalse(r)
 
 
-class GetTeamsNSTestCase(SQLCachedTestCase):
+class GetTeamsNSTestCase(SSOBaseTestCase):
     def setUp(self):
         super(GetTeamsNSTestCase, self).setUp()
 
@@ -49,7 +50,7 @@
         self.assertRaises(TeamsNamespaceError, getTeamsNS, message)
 
 
-class TeamsRequestTestCase(SQLCachedTestCase):
+class TeamsRequestTestCase(SSOBaseTestCase):
     def setUp(self):
         super(TeamsRequestTestCase, self).setUp()
 
@@ -129,7 +130,8 @@
         self.assertEqual(req.getExtensionArgs(), expected)
 
 
-class TeamsResponseTestCase(SQLCachedTestCase):
+class TeamsResponseTestCase(SSOBaseTestCase):
+
     def test_init(self):
         resp = TeamsResponse()
         self.assertEqual(resp.is_member, [])

=== modified file 'identityprovider/tests/test_utils.py'
--- identityprovider/tests/test_utils.py	2010-12-20 17:14:26 +0000
+++ identityprovider/tests/test_utils.py	2011-07-19 13:59:31 +0000
@@ -5,8 +5,7 @@
 from unittest import TestCase
 from django.utils.translation import ugettext as _
 
-from identityprovider.tests.utils import (BasicAccountTestCase,
-    LPAccountTestCase, SQLCachedTestCase)
+from identityprovider.tests.utils import (SSOBaseTestCase, LPAccountTestCase)
 from identityprovider.models.person import Person
 from identityprovider.models.account import LPOpenIdIdentifier
 from identityprovider.models.emailaddress import EmailAddress
@@ -16,7 +15,7 @@
      PersonAndAccountNotFoundException, http_request_with_timeout)
 
 
-class CanonicalUrlTestCase(SQLCachedTestCase):
+class CanonicalUrlTestCase(SSOBaseTestCase):
 
     def test_when_object_is_not_person(self):
         self.assertTrue(canonical_url(None) is None)
@@ -30,7 +29,7 @@
         self.assertEquals(url, "https://launchpad.net/~test/TEST")
 
 
-class GetPersonAndAccountByEmailTestCase(BasicAccountTestCase):
+class GetPersonAndAccountByEmailTestCase(SSOBaseTestCase):
 
     fixtures = ["test"]
 
@@ -47,6 +46,8 @@
 
 class LPGetPersonAndAccountByEmailTestCase(LPAccountTestCase):
 
+    fixtures = ["test"]
+
     def test_person_does_not_exist(self):
         LPOpenIdIdentifier.objects.all().delete()
 
@@ -55,13 +56,13 @@
         self.assertEquals(None, person)
 
 
-class PasswordPolicyCompliantTestCase(SQLCachedTestCase):
+class PasswordPolicyCompliantTestCase(SSOBaseTestCase):
 
     def test_when_password_is_to_short(self):
         self.assertFalse(password_policy_compliant('a'))
 
 
-class PoliteFormErrorsTestCase(SQLCachedTestCase):
+class PoliteFormErrorsTestCase(SSOBaseTestCase):
 
     def test_polite_errors(self):
         text = _("Enter a valid e-mail address.")
@@ -72,7 +73,7 @@
         self.assertTrue(errors['email'][0] != text)
 
 
-class ValidateLaunchpadPasswordTestCase(SQLCachedTestCase):
+class ValidateLaunchpadPasswordTestCase(SSOBaseTestCase):
 
     def test_when_there_is_binascii_error_is_raised(self):
         self.assertFalse(validate_launchpad_password('a', 'b'))

=== modified file 'identityprovider/tests/test_views_account.py'
--- identityprovider/tests/test_views_account.py	2011-01-10 15:02:53 +0000
+++ identityprovider/tests/test_views_account.py	2011-07-19 13:59:31 +0000
@@ -11,10 +11,10 @@
 from identityprovider.models.const import AccountStatus, EmailStatus
 from identityprovider.utils import validate_launchpad_password
 
-from utils import BasicAccountTestCase, AuthenticatedTestCase
-
-
-class AccountViewsUnauthenticatedTestCase(BasicAccountTestCase):
+from utils import SSOBaseTestCase, AuthenticatedTestCase
+
+
+class AccountViewsUnauthenticatedTestCase(SSOBaseTestCase):
 
     def test_index_unauthenticated(self):
         r = self.client.get('/+edit')
@@ -180,7 +180,9 @@
                           'raw_orequest content')
 
 
-class ApplicationsTestCase(BasicAccountTestCase):
+class ApplicationsTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def setUp(self):
         self.client.login(username="[e-mail]", password="test")

=== modified file 'identityprovider/tests/test_views_consumer.py'
--- identityprovider/tests/test_views_consumer.py	2010-11-25 00:19:08 +0000
+++ identityprovider/tests/test_views_consumer.py	2011-07-19 13:59:31 +0000
@@ -12,16 +12,18 @@
 from openid.yadis.constants import YADIS_CONTENT_TYPE
 from urllib import quote_plus
 
+
 # need to override fetcher before consumer module gets imported
 class MockFetcher(fetchers.Urllib2Fetcher):
+
     called = False
+
     def fetch(self, url, body=None, headers=None):
         MockFetcher.called = True
         return super(MockFetcher, self).fetch(url, body, headers)
 
 fetchers.Urllib2Fetcher = MockFetcher
-from identityprovider.tests.utils import (SQLCachedTestCase,
-    OpenIDProviderTestCase)
+from identityprovider.tests.utils import SSOBaseTestCase
 from identityprovider.views import server
 from identityprovider.views.consumer import (SREG_DONT_REQUEST, SREG_OPTIONAL,
     SREG_REQUIRED, getBaseURL, normalDict, getOpenIDStore, getConsumer,
@@ -99,7 +101,8 @@
         self.assertTrue(fullname in response.content)
 
 
-class ConsumerTestCase(OpenIDProviderTestCase):
+class ConsumerTestCase(SSOBaseTestCase):
+
     def setUp(self):
         super(ConsumerTestCase, self).setUp()
 

=== modified file 'identityprovider/tests/test_views_i18n.py'
--- identityprovider/tests/test_views_i18n.py	2010-05-17 12:35:48 +0000
+++ identityprovider/tests/test_views_i18n.py	2011-07-19 13:59:31 +0000
@@ -1,8 +1,10 @@
-from identityprovider.tests.utils import BasicAccountTestCase
+from identityprovider.tests.utils import SSOBaseTestCase
 from identityprovider.models.account import Account
 
 
-class SetLanguageTestCase(BasicAccountTestCase):
+class SetLanguageTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def setUp(self):
         self.disable_csrf()

=== modified file 'identityprovider/tests/test_views_preflight.py'
--- identityprovider/tests/test_views_preflight.py	2011-03-04 17:09:45 +0000
+++ identityprovider/tests/test_views_preflight.py	2011-07-19 13:59:31 +0000
@@ -1,10 +1,10 @@
 from django.conf import settings
 
 from identityprovider.models.account import Account
-from identityprovider.tests.utils import BasicAccountTestCase
-
-
-class PreflightViewAccessTestCase(BasicAccountTestCase):
+from identityprovider.tests.utils import SSOBaseTestCase
+
+
+class PreflightViewAccessTestCase(SSOBaseTestCase):
 
     fixtures = ["test"]
     URL = '/preflight/'

=== modified file 'identityprovider/tests/test_views_server.py'
--- identityprovider/tests/test_views_server.py	2011-07-12 13:40:12 +0000
+++ identityprovider/tests/test_views_server.py	2011-07-19 13:59:31 +0000
@@ -29,8 +29,8 @@
 from identityprovider.models.authtoken import create_token
 
 from identityprovider.views import server
-from identityprovider.tests.utils import (SQLCachedTestCase,
-    BasicAccountTestCase, AuthenticatedTestCase, OpenIDProviderTestCase)
+
+from .utils import SSOBaseTestCase, AuthenticatedTestCase
 
 
 class DummyORequest(object):
@@ -61,7 +61,7 @@
         self.META = {}
 
 
-class HandleOpenIDErrorTestCase(OpenIDProviderTestCase):
+class HandleOpenIDErrorTestCase(SSOBaseTestCase):
 
     # tests for the _handle_openid_error method
 
@@ -84,7 +84,7 @@
         self.assertTrue(error_msg in r.content)
 
 
-class ProcessOpenIDRequestTestCase(OpenIDProviderTestCase):
+class ProcessOpenIDRequestTestCase(SSOBaseTestCase):
 
     # tests for the _process_openid_request method
 
@@ -94,7 +94,7 @@
         self.assertTemplateUsed(r, 'server_info.html')
 
 
-class HandleUserResponseTestCase(OpenIDProviderTestCase):
+class HandleUserResponseTestCase(SSOBaseTestCase):
     fixtures = ['test']
 
     def setUp(self):
@@ -223,7 +223,7 @@
         self.assertEqual('de', self.client.session['django_language'])
 
 
-class ValidOpenIDTestCase(OpenIDProviderTestCase):
+class ValidOpenIDTestCase(SSOBaseTestCase):
 
     def test_is_valid_openid_idselect(self):
         valid = server._is_valid_openid_for_this_site(IDENTIFIER_SELECT)
@@ -283,8 +283,7 @@
         self.assertFalse(valid)
 
 
-class DecideTestCase(AuthenticatedTestCase, OpenIDProviderTestCase):
-    fixtures = ['test']
+class DecideTestCase(AuthenticatedTestCase):
 
     def _prepare_openid_token(self, param_overrides=None):
         request = {'openid.mode': 'checkid_setup',
@@ -617,7 +616,7 @@
         settings.OPENID_PREAUTHORIZATION_ACL = old_OPENID_PREAUTHORIZATION_ACL
 
 
-class CancelTestCase(AuthenticatedTestCase, OpenIDProviderTestCase):
+class CancelTestCase(AuthenticatedTestCase):
     def setUp(self):
         super(CancelTestCase, self).setUp(disableCSRF=True)
 
@@ -670,7 +669,7 @@
         self.assertEqual(query['openid.mode'], 'cancel')
 
 
-class XRDSTestCase(OpenIDProviderTestCase):
+class XRDSTestCase(SSOBaseTestCase):
     fixtures = ['test']
 
     def assert_xrds_document(self, response, template=None):
@@ -792,7 +791,7 @@
         self.assertTrue(r)
 
 
-class ShouldReauthenticateTestCase(SQLCachedTestCase):
+class ShouldReauthenticateTestCase(SSOBaseTestCase):
     fixtures = ['test']
 
     def setUp(self):
@@ -864,7 +863,7 @@
         self.assertFalse(r)
 
 
-class UntrustedRPTest(OpenIDProviderTestCase):
+class UntrustedRPTest(SSOBaseTestCase):
     fixtures = ['test']
 
     def setUp(self):
@@ -905,7 +904,10 @@
         self.assertTemplateUsed(r, 'untrusted.html')
 
 
-class TestSregFields(BasicAccountTestCase):
+class TestSregFields(SSOBaseTestCase):
+
+    fixtures = ["test"]
+
     def setUp(self):
         super(TestSregFields, self).setUp()
 
@@ -933,10 +935,9 @@
         self.request.user = self.account
 
 
-class MarkupTestCase(SQLCachedTestCase):
+class MarkupTestCase(SSOBaseTestCase):
 
     fixtures = ["test"]
-    pgsql_functions = ["generate_openid_identifier"]
 
     def test_untrusted_rp_properly_shows_markup(self):
         self.client.login(username='[e-mail]', password='test')
@@ -950,7 +951,7 @@
         self.assertContains(r, '<em>not</em>')
 
 
-class ApprovedDataTest(OpenIDProviderTestCase):
+class ApprovedDataTest(SSOBaseTestCase):
     fixtures = ['test']
 
     def _get_openid_request(self, with_sreg=True, with_teams=True):

=== modified file 'identityprovider/tests/test_views_ui.py'
--- identityprovider/tests/test_views_ui.py	2011-07-15 19:24:52 +0000
+++ identityprovider/tests/test_views_ui.py	2011-07-19 13:59:31 +0000
@@ -28,12 +28,13 @@
 from identityprovider.models.captcha import Captcha
 from identityprovider.models.const import AccountStatus, LoginTokenType
 from identityprovider.tests.utils import (
-    BasicAccountTestCase,
-    LPAccountTestCase, SQLCachedTestCase,
+    LPAccountTestCase,
     MockHandler,
 )
 from identityprovider.utils import is_django_13
 
+from .utils import SSOBaseTestCase
+
 
 def _post_new_account(client, email='[e-mail]', token=None, follow=False):
     if token is None:
@@ -47,17 +48,14 @@
         'passwordconfirm': 'Testing123'}, follow=follow)
 
 
-class UIViewsHelperTestCase(SQLCachedTestCase):
-
+class UIViewsHelperTestCase(SSOBaseTestCase):
 
     def test_is_safe_redirect_url_return_false(self):
         self.assertFalse(ui._is_safe_redirect_url('non-existing'))
 
-
     def test_is_safe_redirect_url_with_params(self):
         self.assertFalse(ui._is_safe_redirect_url('non-existing?q=some_value'))
 
-
     @patch('identityprovider.views.ui.resolve')
     def test_is_safe_redirect_url_404(self, mock_resolve):
         mock_resolve.side_effect = Resolver404()
@@ -65,19 +63,17 @@
         self.assertFalse(ui._is_safe_redirect_url('non-existing'))
 
 
-
-class SpanishUIViewsTestCase(BasicAccountTestCase):
-
+class SpanishUIViewsTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def setUp(self):
         self.language_code = settings.LANGUAGE_CODE
         settings.LANGUAGE_CODE = 'es'
 
-
     def tearDown(self):
         settings.LANGUAGE_CODE = self.language_code
 
-
     def test_new_account_in_spanish(self):
         account = Account.objects.get_by_email('[e-mail]')
         account.status = AccountStatus.ACTIVE
@@ -89,8 +85,9 @@
         self.assertEqual(len(mail.outbox), 1)
 
 
+class UIViewsTestCase(SSOBaseTestCase):
 
-class UIViewsTestCase(BasicAccountTestCase):
+    fixtures = ["test"]
 
     def setUp(self):
         logging.disable(logging.WARNING)
@@ -169,7 +166,7 @@
                                  'Your account has been deactivated')
 
     def test_login_without_next_with_token(self):
-        token = 'a'*16
+        token = 'a' * 16
         r = self.client.post("/%s/+login" % token,
             {'email': '[e-mail]', 'password': 'test'})
         self.assertEqual(r.status_code, 302)
@@ -335,7 +332,7 @@
 
     def test_confirm_account_redirect_to_decide_token_error(self):
         # get a valid session
-        token1 = 'a'*16
+        token1 = 'a' * 16
         r = _post_new_account(self.client, token=token1)
         self.assertRedirects(r, '/%s/+email-sent' % token1)
 
@@ -373,7 +370,8 @@
         session.save()
 
         # create rpconfig
-        rpconfig = OpenIDRPConfig.objects.create(trust_root='http://localhost/')
+        rpconfig = OpenIDRPConfig.objects.create(
+            trust_root='http://localhost/')
 
         # claim token
         r = self.client.post(self._token_url('+newaccount'),
@@ -452,7 +450,6 @@
 
         self.assertEqual(len(mail.outbox), 0)
 
-
     def test_forgot_password_invalid_form(self):
         r = self.client.post('/+forgot_password')
         self.assertEqual(r.status_code, 200)
@@ -776,6 +773,9 @@
 
 
 class UIViewsLPModelTestCase(LPAccountTestCase):
+
+    fixtures = ["test"]
+
     def test_new_account_when_person_does_not_exist(self):
         # create email address with broken foreign key
         email = EmailAddress.objects.get(email__iexact='[e-mail]')
@@ -793,7 +793,9 @@
             email.save()
 
 
-class CaptchaVerificationTestCase(BasicAccountTestCase):
+class CaptchaVerificationTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def setUp(self):
         self.client = Client(REMOTE_ADDR='127.0.0.1')
@@ -814,7 +816,9 @@
         self.assertContains(r, msg)
 
 
-class LanguagesTestCase(BasicAccountTestCase):
+class LanguagesTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def test_preffered_lang_is_preserved_after_logout(self):
         account = Account.objects.get_by_email("[e-mail]")
@@ -841,7 +845,9 @@
         self.reset_csrf()
 
 
-class CookiesTestCase(BasicAccountTestCase):
+class CookiesTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def setUp(self):
         super(CookiesTestCase, self).setUp()

=== modified file 'identityprovider/tests/test_views_ui_logout.py'
--- identityprovider/tests/test_views_ui_logout.py	2011-05-11 13:02:21 +0000
+++ identityprovider/tests/test_views_ui_logout.py	2011-07-19 13:59:31 +0000
@@ -54,7 +54,7 @@
             displayname="Example",
             creation_rationale=AccountCreationRationale.UNKNOWN)
 
-    def test_get_return_to_root_url_without_referer_and_url_is_recognized(self):
+    def test_get_return_to_root_url(self):
         trust_root = 'http://example.com/'
         self.create_openid_rp_config(trust_root)
         return_to = self.view.get_return_to_url(trust_root, None)
@@ -83,7 +83,8 @@
     def test_get_return_to_url_when_tricky_trust(self):
         trust_root = 'http://%.example.com/r'
         self.create_openid_rp_config(trust_root)
-        return_to = self.view.get_return_to_url('http://launchpad.net/?sneaky=.example.com/r', None)
+        return_to = self.view.get_return_to_url(
+            'http://launchpad.net/?sneaky=.example.com/r', None)
         self.assertTrue(return_to is None)
 
     def test_get_return_to_url_when_tricky_return(self):
@@ -155,12 +156,13 @@
         site_name = self.view.get_site_name('http://notvalid.com/')
         self.assertTrue(site_name is None)
 
-
     def sites_with_active_sessions(self):
         return []
 
     def test_call(self):
-        """Sanity check test, make sure that all code in __call__ is runable."""
+        """
+        Sanity check test, make sure that all code in __call__ is runable.
+        """
         self.user = self
         self.session = SessionStore()
         self.GET = {}

=== modified file 'identityprovider/tests/test_views_utils.py'
--- identityprovider/tests/test_views_utils.py	2010-04-21 15:29:24 +0000
+++ identityprovider/tests/test_views_utils.py	2011-07-19 13:59:31 +0000
@@ -3,10 +3,10 @@
 
 from identityprovider.models import OpenIDRPConfig
 from identityprovider.views import utils
-from identityprovider.tests.utils import SQLCachedTestCase
-
-
-class RedirectionURLForTokenTestCase(SQLCachedTestCase):
+from identityprovider.tests.utils import SSOBaseTestCase
+
+
+class RedirectionURLForTokenTestCase(SSOBaseTestCase):
 
     def test_if_token_is_none(self):
         url = utils.redirection_url_for_token(None)
@@ -18,7 +18,7 @@
         self.assertEquals(url, "/ABCDEFGH/")
 
 
-class GetRPConfigTestCase(SQLCachedTestCase):
+class GetRPConfigTestCase(SSOBaseTestCase):
     trust_root1 = 'http://launchpad.dev/'
     trust_root2 = 'http://launchpad.dev'
 

=== modified file 'identityprovider/tests/test_widgets.py'
--- identityprovider/tests/test_widgets.py	2010-12-20 17:45:04 +0000
+++ identityprovider/tests/test_widgets.py	2011-07-19 13:59:31 +0000
@@ -7,7 +7,7 @@
 
 from identityprovider.models import Account
 from identityprovider.models.account import LPOpenIdIdentifier
-from identityprovider.tests.utils import SQLCachedTestCase
+from identityprovider.tests.utils import SSOBaseTestCase
 from identityprovider.widgets import (CommaSeparatedWidget, ROAwareSelect,
     ROAwareTextInput, StatusWidget, ReadOnlyDateTimeWidget, LPUsernameWidget)
 
@@ -139,7 +139,7 @@
         self.assertEqual(r, '2010-01-01 00:00:00')
 
 
-class LPUsernameWidgetTestCase(SQLCachedTestCase):
+class LPUsernameWidgetTestCase(SSOBaseTestCase):
 
     fixtures = ['test']
 

=== modified file 'identityprovider/tests/test_xrds.py'
--- identityprovider/tests/test_xrds.py	2010-04-21 15:29:24 +0000
+++ identityprovider/tests/test_xrds.py	2011-07-19 13:59:31 +0000
@@ -1,10 +1,12 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from utils import BasicAccountTestCase
-
-
-class XRDSTest(BasicAccountTestCase):
+from .utils import SSOBaseTestCase
+
+
+class XRDSTest(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def test_id_html(self):
         r = self.client.get('/+id/mark_oid')

=== modified file 'identityprovider/tests/utils.py'
--- identityprovider/tests/utils.py	2011-06-29 19:47:22 +0000
+++ identityprovider/tests/utils.py	2011-07-19 13:59:31 +0000
@@ -24,26 +24,15 @@
 from identityprovider import decorators
 
 
-def create_pgsql_functions(functions):
-    cursor = connection.cursor()
-    cursor.execute(PGSQL_FUNCTIONS['__init__'])
-    for function in functions:
-        cursor.execute(PGSQL_FUNCTIONS[function])
-    cursor.execute("COMMIT")
-
-
-class SQLCachedTestCase(TransactionTestCase):
-    def _pre_setup(self):
-        super(SQLCachedTestCase, self)._pre_setup()
-        functions = getattr(self, 'pgsql_functions', [])
-        create_pgsql_functions(functions)
-
-
-class BasicAccountTestCase(SQLCachedTestCase):
-    """ This SQLCachedTestCase subclass has some initial fixtures
-    and functions set for basic tests. """
-    fixtures = ['test']
-    pgsql_functions = ['generate_openid_identifier']
+class SSOBaseTestCase(TestCase):
+
+    def get_query(self, response):
+        query_start = response['Location'].find('?')
+        query_str = response['Location'][query_start + 1:]
+        query_items = map(tuple,
+            [item.split('=') for item in query_str.split('&')])
+        query = dict(query_items)
+        return query
 
     def reset_csrf(self):
         settings.MIDDLEWARE_CLASSES = self._MIDDLEWARE_CLASSES
@@ -54,7 +43,7 @@
                                          if not 'csrf' in x.lower())
 
 
-class LPAccountTestCase(BasicAccountTestCase):
+class LPAccountTestCase(TransactionTestCase):
 
     def setUp(self):
         super(LPAccountTestCase, self).setUp()
@@ -67,7 +56,6 @@
                        'emailaddress_person_fkey')
         cursor.execute("BEGIN")
 
-
     def tearDown(self):
         # enable person constraint
         cursor = connection.cursor()
@@ -76,11 +64,12 @@
                        'emailaddress_person_fkey FOREIGN KEY (person) '
                        'REFERENCES lp_person(id) DEFERRABLE INITIALLY '
                        'DEFERRED')
-
         super(LPAccountTestCase, self).tearDown()
 
 
-class AuthenticatedTestCase(BasicAccountTestCase):
+class AuthenticatedTestCase(SSOBaseTestCase):
+
+    fixtures = ["test"]
 
     def setUp(self, disableCSRF=False):
         # We allow classes that inherit this one to disable CSRF when needed,
@@ -102,20 +91,6 @@
         settings.MIDDLEWARE_CLASSES = self.old_middlewares
 
 
-class OpenIDProviderTestCase(SQLCachedTestCase):
-    pgsql_functions = ['generate_openid_identifier']
-
-    def get_query(self, response):
-        query_start = response['Location'].find('?')
-        query_str = response['Location'][query_start+1:]
-        query_items = map(tuple,
-            [item.split('=') for item in query_str.split('&')])
-        query = dict(query_items)
-        return query
-
-
-
-
 def make_identifier_select_endpoint(protocol_uri):
     """Create an endpoint for use in OpenID identifier select mode.
 
@@ -197,6 +172,7 @@
     "A class that simulates writing to /dev/null."
     def write(self, s):
         pass
+
     def flush(self):
         pass
 
@@ -245,52 +221,6 @@
     return len(result.failures) + len(result.errors)
 
 
-PGSQL_FUNCTIONS = {
-    '__init__': '''
-DROP LANGUAGE IF EXISTS plpythonu CASCADE;
-CREATE LANGUAGE plpythonu;
-''',
-    'generate_openid_identifier': '''
-CREATE OR REPLACE FUNCTION generate_openid_identifier()
-  RETURNS text AS
-$BODY$
-    from random import choice
-
-    # Non display confusing characters.
-    chars = '34678bcdefhkmnprstwxyzABCDEFGHJKLMNPQRTWXY'
-
-    # Character length of tokens. Can be increased, decreased or even made
-    # random - Launchpad does not care. 7 means it takes 40 bytes to store
-    # a null-terminated Launchpad identity URL on the current domain name.
-    length=7
-
-    loop_count = 0
-    while loop_count < 20000:
-        # Generate a random openid_identifier
-        oid = ''.join(choice(chars) for count in range(length))
-
-        # Check if the oid is already in the db, although this is pretty
-        # unlikely
-        rv = plpy.execute("""
-            SELECT COUNT(*) AS num FROM Account WHERE openid_identifier = '%%s'
-            """ %% oid, 1)
-        if rv[0]['num'] == 0:
-            return oid
-        loop_count += 1
-        if loop_count == 1:
-            plpy.warning(
-                'Clash generating unique openid_identifier. '
-                'Increase length if you see this warning too much.')
-    plpy.error(
-        "Unable to generate unique openid_identifier. "
-        "Need to increase length of tokens.")
-$BODY$
-  LANGUAGE 'plpythonu' VOLATILE
-  COST 100;
-''',
-}
-
-
 class MockHandler(urllib2.HTTPHandler):
 
     def set_next_response(self, msg):
@@ -311,7 +241,8 @@
     from datetime import date
     from identityprovider.models.person import Person
     from identityprovider.models.account import (Account, LPOpenIdIdentifier)
-    from identityprovider.models.team import (TeamMembership, TeamParticipation)
+    from identityprovider.models.team import (
+        TeamMembership, TeamParticipation)
 
     memberships = TeamMembership.get_team_memberships_for_user([teamname],
                                                                account, True)
@@ -333,14 +264,15 @@
     try:
         t = Person.objects.get(name=teamname)
     except Person.DoesNotExist:
-        t = Person.objects.create(displayname="Team %s" % teamname, teamowner=p,
-                                  name=teamname)
+        t = Person.objects.create(displayname="Team %s" % teamname,
+                                  teamowner=p, name=teamname)
 
     now = date.today()
-    exp = date(day=now.day, month=now.month, year=now.year+1)
+    exp = date(day=now.day, month=now.month, year=(now.year + 1))
     TeamMembership.objects.create(person=p, date_expires=exp, team=t, status=1)
     TeamParticipation.objects.create(team=t, person=p)
 
+
 def get_unique_username():
     from identityprovider.models.person import Person
     i = 0
@@ -352,4 +284,3 @@
         except Person.DoesNotExist:
             break
     return username
-

=== modified file 'payload/__init__.py'
--- payload/__init__.py	2011-07-12 14:27:59 +0000
+++ payload/__init__.py	2011-07-19 13:59:31 +0000
@@ -31,7 +31,8 @@
 
 # translations
 APPS = ["identityprovider"]
-TRANSLATIONS_BRANCH = 'lp:~canonical-isd-hackers/canonical-identity-provider/translations'
+TRANSLATIONS_BRANCH = (
+    'lp:~canonical-isd-hackers/canonical-identity-provider/translations')
 
 
 # fab targets
@@ -65,7 +66,7 @@
 
 
 # development
-def test(functional=False, coverage=False):
+def test(functional=False, coverage=False, extra=''):
     """Run the test suite."""
     hudson = env.get('hudson', False)
 
@@ -79,6 +80,8 @@
         # add support for cobertura
         cmd.append('--with-xcoverage --cover-package=identityprovider')
         cmd.append('--with-xunit')
+    # So you can add things like --stop
+    cmd.append(extra)
     virtualenv(' '.join(cmd), capture=False)