Merge lp:~canonical-isd-hackers/canonical-identity-provider/lock-view into lp:canonical-identity-provider/release

[David Owen]

Removed obsolete lock view

[ISD Branch Mangler (isd-branches-mangler)]

More than one proposal found for merge of lp:~canonical-isd-hackers/canonical-identity-provider/flakes into lp:canonical-identity-provider, which is not Superseded.

[ISD Branch Mangler (isd-branches-mangler)]

More than one proposal found for merge of lp:~canonical-isd-hackers/canonical-identity-provider/flakes into lp:canonical-identity-provider, which is not Superseded.

=== modified file 'identityprovider/urls.py'
--- identityprovider/urls.py	2011-12-16 16:02:09 +0000
+++ identityprovider/urls.py	2011-12-21 17:00:31 +0000
@@ -104,7 +104,6 @@
         (r'^~(?P<username>[A-Za-z0-9\-_]+)(/(?P<version>[1|2]))?$',
             'delegate_profile'),
         (r'^error$', 'error'),
-        (r'^lock-accounts$', 'lock_accounts'),
     )
     urlpatterns += patterns('',
         (r'(favicon.ico)', 'django.views.static.serve',

=== modified file 'identityprovider/views/testing.py'
--- identityprovider/views/testing.py	2011-12-15 20:51:19 +0000
+++ identityprovider/views/testing.py	2011-12-21 17:00:31 +0000
@@ -63,18 +63,6 @@
     """ Raise an internal server error """
     raise FloatingPointError("This error is a test.  Please ignore.")
 
-def lock_accounts(request):
-    from django.db import connection
-    if request.method == 'POST':
-        cursor = connection.cursor()
-        cursor.execute('SET statement_timeout TO 0')
-        cursor.execute('SELECT * FROM account FOR UPDATE')
-        cursor.execute('SELECT pg_sleep(30)')
-    return HttpResponse('''
-<form method="post">
-  <input type="submit" value="Lock">
-</form>
-''')
 
 # This gives mock & patch a nice easy location to patch a wait into
 # the handler.