Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
@jezdez jezdez authored
View
19 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",
@@ -27,15 +27,6 @@
}
},
{
- "pk": 4,
- "model": "contenttypes.contenttype",
- "fields": {
- "model": "message",
- "name": "message",
- "app_label": "auth"
- }
- },
- {
"pk": 1,
"model": "contenttypes.contenttype",
"fields": {
@@ -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"
}
}
-]
+]
View
8 django/contrib/auth/tests/permissions.py
@@ -32,7 +32,7 @@ def test_permission_register_order(self):
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')
Please sign in to comment.
Something went wrong with that request. Please try again.