From 5cea4c979f2776f9a78b6b410b4a14b30262fd8c Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Tue, 24 Nov 2015 08:22:05 -0500 Subject: [PATCH] [1.9.x] Removed explicit User ids in tests. Backport of 935061621136ddb4e4ca65a1861ee57e4e3dda09 from master --- tests/admin_views/test_adminsite.py | 2 +- tests/admin_views/tests.py | 101 ++++++++++---------- tests/auth_tests/test_context_processors.py | 4 +- tests/timezones/tests.py | 2 +- 4 files changed, 55 insertions(+), 54 deletions(-) diff --git a/tests/admin_views/test_adminsite.py b/tests/admin_views/test_adminsite.py index 575a15c23a..b971d5f23b 100644 --- a/tests/admin_views/test_adminsite.py +++ b/tests/admin_views/test_adminsite.py @@ -32,7 +32,7 @@ class SiteEachContextTest(TestCase): @classmethod def setUpTestData(cls): cls.u1 = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10), diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 0e47a43b1d..e9fcc89899 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -74,7 +74,7 @@ class AdminViewBasicTestCase(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -991,7 +991,7 @@ class AdminViewFormUrlTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -1045,7 +1045,7 @@ class AdminJavaScriptTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -1093,7 +1093,7 @@ class SaveAsTests(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -1260,37 +1260,37 @@ class AdminViewPermissionsTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) ) cls.adduser = User.objects.create( - id=101, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='adduser', first_name='Add', last_name='User', email='auser@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) ) cls.changeuser = User.objects.create( - id=102, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='changeuser', first_name='Change', last_name='User', email='cuser@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) ) cls.deleteuser = User.objects.create( - id=103, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='deleteuser', first_name='Delete', last_name='User', email='duser@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) ) cls.joepublicuser = User.objects.create( - id=104, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='joepublic', first_name='Joe', last_name='Public', email='joepublic@example.com', is_staff=False, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) ) cls.nostaffuser = User.objects.create( - id=106, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='nostaff', first_name='No', last_name='Staff', email='nostaff@example.com', is_staff=False, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -1955,7 +1955,7 @@ class AdminViewsNoUrlTest(TestCase): @classmethod def setUpTestData(cls): cls.changeuser = User.objects.create( - id=102, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='changeuser', first_name='Change', last_name='User', email='cuser@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -1982,13 +1982,13 @@ class AdminViewDeletedObjectsTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) ) cls.deleteuser = User.objects.create( - id=103, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='deleteuser', first_name='Delete', last_name='User', email='duser@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -2168,7 +2168,7 @@ class TestGenericRelations(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -2192,7 +2192,7 @@ class AdminViewStringPrimaryKeyTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -2214,7 +2214,8 @@ class AdminViewStringPrimaryKeyTest(TestCase): ) cls.m1 = ModelWithStringPrimaryKey.objects.create(string_pk=cls.pk) content_type_pk = ContentType.objects.get_for_model(ModelWithStringPrimaryKey).pk - LogEntry.objects.log_action(100, content_type_pk, cls.pk, cls.pk, 2, change_message='Changed something') + user_pk = cls.superuser.pk + LogEntry.objects.log_action(user_pk, content_type_pk, cls.pk, cls.pk, 2, change_message='Changed something') def setUp(self): self.client.force_login(self.superuser) @@ -2428,7 +2429,7 @@ class AdminViewUnicodeTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -2504,7 +2505,7 @@ class AdminViewListEditable(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -2937,13 +2938,13 @@ class AdminSearchTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) ) cls.joepublicuser = User.objects.create( - id=104, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='joepublic', first_name='Joe', last_name='Public', email='joepublic@example.com', is_staff=False, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -3061,7 +3062,7 @@ class AdminInheritedInlinesTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -3153,7 +3154,7 @@ class AdminActionsTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -3464,7 +3465,7 @@ class TestCustomChangeList(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -3497,7 +3498,7 @@ class TestInlineNotEditable(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -3522,7 +3523,7 @@ class AdminCustomQuerysetTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -3782,7 +3783,7 @@ class AdminInlineFileUploadTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -3834,7 +3835,7 @@ class AdminInlineTests(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -4160,7 +4161,7 @@ class NeverCacheTests(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -4240,7 +4241,7 @@ class PrePopulatedTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -4284,7 +4285,7 @@ class SeleniumAdminViewsFirefoxTests(AdminSeleniumWebDriverTestCase): def setUp(self): self.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -4555,7 +4556,7 @@ class ReadonlyTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -4696,7 +4697,7 @@ class LimitChoicesToInAdminTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -4728,7 +4729,7 @@ class RawIdFieldsTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -4826,19 +4827,19 @@ class UserAdminTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) ) cls.adduser = User.objects.create( - id=101, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='adduser', first_name='Add', last_name='User', email='auser@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) ) cls.changeuser = User.objects.create( - id=102, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='changeuser', first_name='Change', last_name='User', email='cuser@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5005,7 +5006,7 @@ class GroupAdminTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5042,7 +5043,7 @@ class CSSTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5185,7 +5186,7 @@ class AdminDocsTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5248,7 +5249,7 @@ class ValidXHTMLTests(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5271,7 +5272,7 @@ class DateHierarchyTests(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5405,7 +5406,7 @@ class AdminCustomSaveRelatedTests(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5478,7 +5479,7 @@ class AdminViewLogoutTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5512,7 +5513,7 @@ class AdminUserMessageTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5576,13 +5577,13 @@ class AdminKeepChangeListFiltersTests(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) ) cls.joepublicuser = User.objects.create( - id=104, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=False, username='joepublic', first_name='Joe', last_name='Public', email='joepublic@example.com', is_staff=False, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5880,7 +5881,7 @@ class TestLabelVisibility(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -5927,7 +5928,7 @@ class AdminViewOnSiteTests(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -6064,7 +6065,7 @@ class InlineAdminViewOnSiteTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -6139,7 +6140,7 @@ class GetFormsetsWithInlinesArgumentTest(TestCase): @classmethod def setUpTestData(cls): cls.superuser = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) diff --git a/tests/auth_tests/test_context_processors.py b/tests/auth_tests/test_context_processors.py index e76c8df004..10f4d81612 100644 --- a/tests/auth_tests/test_context_processors.py +++ b/tests/auth_tests/test_context_processors.py @@ -74,7 +74,7 @@ class AuthContextProcessorTests(TestCase): def setUpTestData(cls): # password = "secret" cls.u1 = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True, date_joined=datetime.datetime(2007, 5, 30, 13, 20, 10) @@ -138,7 +138,7 @@ class AuthContextProcessorTests(TestCase): user = authenticate(username='super', password='secret') response = self.client.get('/auth_processor_user/') self.assertContains(response, "unicode: super") - self.assertContains(response, "id: 100") + self.assertContains(response, "id: %d" % self.u1.pk) self.assertContains(response, "username: super") # bug #12037 is tested by the {% url %} in the template: self.assertContains(response, "url: /userpage/super/") diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py index 57c71d995c..52611b9b3a 100644 --- a/tests/timezones/tests.py +++ b/tests/timezones/tests.py @@ -1209,7 +1209,7 @@ class AdminTests(TestCase): def setUpTestData(cls): # password = "secret" cls.u1 = User.objects.create( - id=100, password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', + password='sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158', last_login=datetime.datetime(2007, 5, 30, 13, 20, 10, tzinfo=UTC), is_superuser=True, username='super', first_name='Super', last_name='User', email='super@example.com', is_staff=True, is_active=True,