Fix django-1.6 incompatibilities

[patchwork] / apps / patchwork / tests / user.py

diff --git a/apps/patchwork/tests/user.py b/apps/patchwork/tests/user.py
index 3df9dc7ddaa170d6569337bd52a5f7d5f30b9bc7..08b9fa5791e948f81bd9464ffe0d75d3d9873d51 100644 (file)
--- a/apps/patchwork/tests/user.py
+++ b/apps/patchwork/tests/user.py
@@ -25,7 +25,7 @@ from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.contrib.auth.models import User
 from patchwork.models import EmailConfirmation, Person, Bundle
 from django.conf import settings
 from django.contrib.auth.models import User
 from patchwork.models import EmailConfirmation, Person, Bundle

-from patchwork.tests.utils import defaults
+from patchwork.tests.utils import defaults, error_strings

 
 def _confirmation_url(conf):
     return reverse('patchwork.views.confirm', kwargs = {'key': conf.key})
 
 def _confirmation_url(conf):
     return reverse('patchwork.views.confirm', kwargs = {'key': conf.key})


@@ -65,7 +65,7 @@ class UserPersonRequestTest(TestCase):
         self.assertEquals(response.status_code, 200)
         self.assertTrue(response.context['linkform'])
         self.assertFormError(response, 'linkform', 'email',
         self.assertEquals(response.status_code, 200)
         self.assertTrue(response.context['linkform'])
         self.assertFormError(response, 'linkform', 'email',

-                'Enter a valid e-mail address.')
+                                error_strings['email'])

 
     def testUserPersonRequestValid(self):
         response = self.client.post('/user/link/',
 
     def testUserPersonRequestValid(self):
         response = self.client.post('/user/link/',


@@ -105,12 +105,12 @@ class UserPersonConfirmTest(TestCase):
         self.conf.save()
 
     def testUserPersonConfirm(self):
         self.conf.save()
 
     def testUserPersonConfirm(self):

-        self.assertEquals(Person.objects.count(), 1)
+        self.assertEquals(Person.objects.count(), 0)

         response = self.client.get(_confirmation_url(self.conf))
         self.assertEquals(response.status_code, 200)
 
         # check that the Person object has been created and linked
         response = self.client.get(_confirmation_url(self.conf))
         self.assertEquals(response.status_code, 200)
 
         # check that the Person object has been created and linked

-        self.assertEquals(Person.objects.count(), 2)
+        self.assertEquals(Person.objects.count(), 1)

         person = Person.objects.get(email = self.user.secondary_email)
         self.assertEquals(person.email, self.user.secondary_email)
         self.assertEquals(person.user, self.user.user)
         person = Person.objects.get(email = self.user.secondary_email)
         self.assertEquals(person.email, self.user.secondary_email)
         self.assertEquals(person.user, self.user.user)