Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit 3f37d1673bb8826e1648f77143b94356c5886e16 1 parent 3d97076
Jannis Leidel authored June 14, 2011
19  django/contrib/auth/fixtures/permissionstestdata.json
... ...
@@ -1,6 +1,6 @@
1 1
 [
2 2
     {
3  
-        "pk": 5, 
  3
+        "pk": 4, 
4 4
         "model": "contenttypes.contenttype", 
5 5
         "fields": {
6 6
             "model": "contenttype", 
@@ -18,7 +18,7 @@
18 18
         }
19 19
     }, 
20 20
     {
21  
-        "pk": 8, 
  21
+        "pk": 7, 
22 22
         "model": "contenttypes.contenttype", 
23 23
         "fields": {
24 24
             "model": "logentry", 
@@ -27,15 +27,6 @@
27 27
         }
28 28
     }, 
29 29
     {
30  
-        "pk": 4, 
31  
-        "model": "contenttypes.contenttype", 
32  
-        "fields": {
33  
-            "model": "message", 
34  
-            "name": "message", 
35  
-            "app_label": "auth"
36  
-        }
37  
-    }, 
38  
-    {
39 30
         "pk": 1, 
40 31
         "model": "contenttypes.contenttype", 
41 32
         "fields": {
@@ -45,7 +36,7 @@
45 36
         }
46 37
     }, 
47 38
     {
48  
-        "pk": 6, 
  39
+        "pk": 5, 
49 40
         "model": "contenttypes.contenttype", 
50 41
         "fields": {
51 42
             "model": "session", 
@@ -54,7 +45,7 @@
54 45
         }
55 46
     }, 
56 47
     {
57  
-        "pk": 7, 
  48
+        "pk": 6, 
58 49
         "model": "contenttypes.contenttype", 
59 50
         "fields": {
60 51
             "model": "site", 
@@ -313,4 +304,4 @@
313 304
             "date_joined": "2010-11-19 06:26:59"
314 305
         }
315 306
     }
316  
-]
  307
+]
8  django/contrib/auth/tests/permissions.py
@@ -32,7 +32,7 @@ def test_permission_register_order(self):
32 32
         create_permissions(auth_models, [], verbosity=0)
33 33
         create_permissions(contenttypes_models, [], verbosity=0)
34 34
 
35  
-        stderr = StringIO()
36  
-        call_command('loaddata', 'test_permissions.json',
37  
-                     verbosity=0, commit=False, stderr=stderr)
38  
-        self.assertEqual(stderr.getvalue(), '')
  35
+        stdout = StringIO()
  36
+        call_command('loaddata', 'permissionstestdata.json',
  37
+                     verbosity=1, commit=False, stdout=stdout)
  38
+        self.assertNotEqual(stdout.getvalue(), 'No fixtures found.\n')

0 notes on commit 3f37d16

Please sign in to comment.
Something went wrong with that request. Please try again.