Author: jezdez
Date: 2011-06-14 03:45:49 -0700 (Tue, 14 Jun 2011)
New Revision: 16400
Modified:
django/trunk/django/contrib/auth/fixtures/permissionstestdata.json
django/trunk/django/contrib/auth/tests/permissions.py
Log:
Fixed #16183 -- Fixed an ignored auth test. Thanks, desh.
Modified: django/trunk/django/contrib/auth/fixtures/permissionstestdata.json
===================================================================
--- django/trunk/django/contrib/auth/fixtures/permissionstestdata.json
2011-06-14 10:35:13 UTC (rev 16399)
+++ django/trunk/django/contrib/auth/fixtures/permissionstestdata.json
2011-06-14 10:45:49 UTC (rev 16400)
@@ -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"
}
}
-]
\ No newline at end of file
+]
Modified: django/trunk/django/contrib/auth/tests/permissions.py
===================================================================
--- django/trunk/django/contrib/auth/tests/permissions.py 2011-06-14
10:35:13 UTC (rev 16399)
+++ django/trunk/django/contrib/auth/tests/permissions.py 2011-06-14
10:45:49 UTC (rev 16400)
@@ -32,7 +32,7 @@
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')
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
