From 3f37d1673bb8826e1648f77143b94356c5886e16 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Tue, 14 Jun 2011 10:45:49 +0000
Subject: [PATCH] Fixed #16183 -- Fixed an ignored auth test. Thanks, desh.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 .../auth/fixtures/permissionstestdata.json    | 19 +++++--------------
 django/contrib/auth/tests/permissions.py      |  8 ++++----
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/django/contrib/auth/fixtures/permissionstestdata.json b/django/contrib/auth/fixtures/permissionstestdata.json
index 3e2e290b654..d9787741624 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 3bff0f9fb2e..68704e4305e 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')