test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jannis Leidel 2011-06-14 10:45:49 +00:00
parent 3d970762af
commit 3f37d1673b
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
django/contrib/auth/fixtures/permissionstestdata.json
View File

@ -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"
}
}
]
]

8
django/contrib/auth/tests/permissions.py
View File

@ -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')