Merge lp:~canonical-isd-hackers/canonical-identity-provider/add-2f-to-account-admin-test-fixes into lp:canonical-identity-provider/release

[Stuart Metcalfe]

Fixes broken admin test (typo and forgot import) - oops

Fixes broken admin test (typo and forgot import) - oops

=== modified file 'identityprovider/templates/account/edit.html'
--- identityprovider/templates/account/edit.html	2011-09-15 21:02:31 +0000
+++ identityprovider/templates/account/edit.html	2012-02-10 13:45:22 +0000
@@ -65,7 +65,7 @@
 
 {% block content %}
 <form action="+edit" method="post" class="shortfields">
-	{% csrf_token %}
+    {% csrf_token %}
     <div id="col1">
         <p {% if form.displayname.errors %}class="haserrors"{% endif %}>
             <label class="formLabel" for="id_displayname">{% trans "Full name" %}</label>

=== modified file 'identityprovider/tests/unit/test_admin.py'
--- identityprovider/tests/unit/test_admin.py	2012-02-10 12:04:42 +0000
+++ identityprovider/tests/unit/test_admin.py	2012-02-10 13:45:22 +0000
@@ -8,7 +8,7 @@
 from pyquery import PyQuery
 
 from identityprovider.admin import (AccountPasswordInline,
-    EmailAddressInline)
+    AuthenticationDeviceInline, EmailAddressInline)
 from identityprovider.models import (EmailAddress,
                                      OpenIDRPConfig, APIUser, Person)
 from identityprovider.models.account import (Account, AccountPassword,
@@ -68,7 +68,7 @@
 
     def test_inline_models(self):
         expected_inlines = [AccountPasswordInline, EmailAddressInline,
-                            AuthenticationDevicesInline]
+                            AuthenticationDeviceInline]
         registered_inlines = admin.site._registry[Account].inlines
         self.assertEqual(registered_inlines, expected_inlines)
 
@@ -100,7 +100,10 @@
             'emailaddress_set-0-id': str(email.id),
             'emailaddress_set-0-account': str(account.id),
             'emailaddress_set-0-email': new_email,
-            'emailaddress_set-0-status': str(email.status)})
+            'emailaddress_set-0-status': str(email.status),
+            'devices-TOTAL_FORMS': '0',
+            'devices-INITIAL_FORMS': '0',
+        })
         # Any non-error status code would be fine here, but right now
         # it redirects with a 302.
         self.assertEqual(r.status_code, 302)
@@ -132,7 +135,10 @@
             'emailaddress_set-0-status': str(email.status),
             'emailaddress_set-1-account': str(account.id),
             'emailaddress_set-1-email': '[e-mail]',
-            'emailaddress_set-1-status': str(email.status)})
+            'emailaddress_set-1-status': str(email.status),
+            'devices-TOTAL_FORMS': '0',
+            'devices-INITIAL_FORMS': '0',
+        })
         account = Account.objects.get(pk=1)
         self.assertContains(r, 'Only one email address can be preferred.')
         self.assertEqual(len(account.emailaddress_set.filter(