diff --git a/django/contrib/auth/fixtures/permissionstestdata.json b/django/contrib/auth/fixtures/permissionstestdata.json index 3e2e290b65..d978774162 100644 --- a/django/contrib/auth/fixtures/permissionstestdata.json +++ b/django/contrib/auth/fixtures/permissionstestdata.json @@ -1,6 +1,6 @@ [ { - "pk": 5, + "pk": 4, "model": "contenttypes.contenttype", "fields": { "model": "contenttype", @@ -18,7 +18,7 @@ } }, { - "pk": 8, + "pk": 7, "model": "contenttypes.contenttype", "fields": { "model": "logentry", @@ -26,15 +26,6 @@ "app_label": "admin" } }, - { - "pk": 4, - "model": "contenttypes.contenttype", - "fields": { - "model": "message", - "name": "message", - "app_label": "auth" - } - }, { "pk": 1, "model": "contenttypes.contenttype", @@ -45,7 +36,7 @@ } }, { - "pk": 6, + "pk": 5, "model": "contenttypes.contenttype", "fields": { "model": "session", @@ -54,7 +45,7 @@ } }, { - "pk": 7, + "pk": 6, "model": "contenttypes.contenttype", "fields": { "model": "site", @@ -313,4 +304,4 @@ "date_joined": "2010-11-19 06:26:59" } } -] \ No newline at end of file +] diff --git a/django/contrib/auth/tests/permissions.py b/django/contrib/auth/tests/permissions.py index 3bff0f9fb2..68704e4305 100644 --- a/django/contrib/auth/tests/permissions.py +++ b/django/contrib/auth/tests/permissions.py @@ -32,7 +32,7 @@ class TestAuthPermissions(TestCase): create_permissions(auth_models, [], verbosity=0) create_permissions(contenttypes_models, [], verbosity=0) - stderr = StringIO() - call_command('loaddata', 'test_permissions.json', - verbosity=0, commit=False, stderr=stderr) - self.assertEqual(stderr.getvalue(), '') + stdout = StringIO() + call_command('loaddata', 'permissionstestdata.json', + verbosity=1, commit=False, stdout=stdout) + self.assertNotEqual(stdout.getvalue(), 'No fixtures found.\n')