Merge branch 'master' of github.com:django/django (c0395dea) · Commits · Dom Sekotill / django

django/contrib/auth/tests/management.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ class ChangepasswordManagementCommandTestCase(TestCase):
		command.execute("joe", stdout=self.stdout)
		command_output = self.stdout.getvalue().strip()

		self.assertEquals(command_output, "Changing password for user 'joe'\nPassword changed successfully for user 'joe'")
		self.assertEqual(command_output, "Changing password for user 'joe'\nPassword changed successfully for user 'joe'")
		self.assertTrue(models.User.objects.get(username="joe").check_password("not qwerty"))

		def test_that_max_tries_exits_1(self):

django/contrib/auth/tests/models.py

+11 −11

Original line number	Diff line number	Diff line
		@@ -46,12 +46,12 @@ class NaturalKeysTestCase(TestCase):

		def test_user_natural_key(self):
		staff_user = User.objects.get(username='staff')
		self.assertEquals(User.objects.get_by_natural_key('staff'), staff_user)
		self.assertEquals(staff_user.natural_key(), ('staff',))
		self.assertEqual(User.objects.get_by_natural_key('staff'), staff_user)
		self.assertEqual(staff_user.natural_key(), ('staff',))

		def test_group_natural_key(self):
		users_group = Group.objects.create(name='users')
		self.assertEquals(Group.objects.get_by_natural_key('users'), users_group)
		self.assertEqual(Group.objects.get_by_natural_key('users'), users_group)


		@override_settings(USE_TZ=False)
		@@ -61,7 +61,7 @@ class LoadDataWithoutNaturalKeysTestCase(TestCase):
		def test_user_is_created_and_added_to_group(self):
		user = User.objects.get(username='my_username')
		group = Group.objects.get(name='my_group')
		self.assertEquals(group, user.groups.get())
		self.assertEqual(group, user.groups.get())


		@override_settings(USE_TZ=False)
		@@ -71,7 +71,7 @@ class LoadDataWithNaturalKeysTestCase(TestCase):
		def test_user_is_created_and_added_to_group(self):
		user = User.objects.get(username='my_username')
		group = Group.objects.get(name='my_group')
		self.assertEquals(group, user.groups.get())
		self.assertEqual(group, user.groups.get())


		class UserManagerTestCase(TestCase):
		@@ -79,23 +79,23 @@ class UserManagerTestCase(TestCase):
		def test_create_user(self):
		email_lowercase = 'normal@normal.com'
		user = User.objects.create_user('user', email_lowercase)
		self.assertEquals(user.email, email_lowercase)
		self.assertEquals(user.username, 'user')
		self.assertEquals(user.password, '!')
		self.assertEqual(user.email, email_lowercase)
		self.assertEqual(user.username, 'user')
		self.assertEqual(user.password, '!')

		def test_create_user_email_domain_normalize_rfc3696(self):
		# According to http://tools.ietf.org/html/rfc3696#section-3
		# the "@" symbol can be part of the local part of an email address
		returned = UserManager.normalize_email(r'Abc\@DEF@EXAMPLE.com')
		self.assertEquals(returned, r'Abc\@DEF@example.com')
		self.assertEqual(returned, r'Abc\@DEF@example.com')

		def test_create_user_email_domain_normalize(self):
		returned = UserManager.normalize_email('normal@DOMAIN.COM')
		self.assertEquals(returned, 'normal@domain.com')
		self.assertEqual(returned, 'normal@domain.com')

		def test_create_user_email_domain_normalize_with_whitespace(self):
		returned = UserManager.normalize_email('email\ with_whitespace@D.COM')
		self.assertEquals(returned, 'email\ with_whitespace@d.com')
		self.assertEqual(returned, 'email\ with_whitespace@d.com')

		def test_empty_username(self):
		self.assertRaisesMessage(ValueError,

django/contrib/formtools/tests/wizard/wizardtests/tests.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -303,7 +303,7 @@ class WizardTestGenericViewInterface(TestCase):
		view = TestWizard.as_view([forms.Form])

		response = view(factory.get('/'))
		self.assertEquals(response.context_data['test_key'], 'test_value')
		self.assertEqual(response.context_data['test_key'], 'test_value')

		def test_get_context_data_with_mixin(self):
		class AnotherMixin(object):
		@@ -329,8 +329,8 @@ class WizardTestGenericViewInterface(TestCase):
		view = TestWizard.as_view([forms.Form])

		response = view(factory.get('/'))
		self.assertEquals(response.context_data['test_key'], 'test_value')
		self.assertEquals(response.context_data['another_key'], 'another_value')
		self.assertEqual(response.context_data['test_key'], 'test_value')
		self.assertEqual(response.context_data['another_key'], 'another_value')


		class WizardFormKwargsOverrideTests(TestCase):

django/contrib/gis/geoip/tests.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ class GeoIPTest(unittest.TestCase):
		self.assertEqual('TX', d['region'])
		self.assertEqual(713, d['area_code'])
		geom = g.geos(query)
		self.failIf(not isinstance(geom, GEOSGeometry))
		self.assertTrue(isinstance(geom, GEOSGeometry))
		lon, lat = (-95.4010, 29.7079)
		lat_lon = g.lat_lon(query)
		lat_lon = (lat_lon[1], lat_lon[0])

django/contrib/gis/tests/test_measure.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ class DistanceTest(unittest.TestCase):
		def testAccessInvalid(self):
		"Testing access in invalid units"
		d = D(m=100)
		self.failIf(hasattr(d, 'banana'))
		self.assertFalse(hasattr(d, 'banana'))

		def testAddition(self):
		"Test addition & subtraction"
		@@ -133,7 +133,7 @@ class DistanceTest(unittest.TestCase):
		self.assertTrue(d2 > d1)
		self.assertTrue(d1 == d1)
		self.assertTrue(d1 < d2)
		self.failIf(d3)
		self.assertFalse(d3)

		def testUnitsStr(self):
		"Testing conversion to strings"
		@@ -179,7 +179,7 @@ class AreaTest(unittest.TestCase):
		def testAccessInvaliA(self):
		"Testing access in invalid units"
		a = A(sq_m=100)
		self.failIf(hasattr(a, 'banana'))
		self.assertFalse(hasattr(a, 'banana'))

		def testAddition(self):
		"Test addition & subtraction"
		@@ -267,7 +267,7 @@ class AreaTest(unittest.TestCase):
		self.assertTrue(a2 > a1)
		self.assertTrue(a1 == a1)
		self.assertTrue(a1 < a2)
		self.failIf(a3)
		self.assertFalse(a3)

		def testUnitsStr(self):
		"Testing conversion to strings"