Author: russellm
Date: 2008-07-13 03:57:30 -0500 (Sun, 13 Jul 2008)
New Revision: 7915
Modified:
django/trunk/tests/regressiontests/admin_scripts/tests.py
Log:
Fixed #7728 -- Modified the output check in the admin script tests. Checking
for pyc is a CPython-specific check, and it breaks CPython if pyc files aren't
generated (due to permission problems, etc). Thanks to Maciej Fijalkowski
(fijal) for the report and fix.
Modified: django/trunk/tests/regressiontests/admin_scripts/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/tests.py 2008-07-13
08:48:18 UTC (rev 7914)
+++ django/trunk/tests/regressiontests/admin_scripts/tests.py 2008-07-13
08:57:30 UTC (rev 7915)
@@ -801,8 +801,9 @@
out, err = self.run_manage(args)
self.assertNoOutput(err)
self.assertOutput(out, "EXECUTE:AppCommand app=<module
'django.contrib.auth.models'")
- self.assertOutput(out,
os.sep.join(['django','contrib','auth','models.pyc']) + "'>,
options=[('pythonpath', None), ('settings', None), ('traceback', None)]")
-
+ self.assertOutput(out,
os.sep.join(['django','contrib','auth','models.py']))
+ self.assertOutput(out, "'>, options=[('pythonpath', None),
('settings', None), ('traceback', None)]")
+
def test_app_command_no_apps(self):
"User AppCommands raise an error when no app name is provided"
args = ['app_command']
@@ -817,7 +818,8 @@
self.assertOutput(out, "EXECUTE:AppCommand app=<module
'django.contrib.auth.models'")
self.assertOutput(out,
os.sep.join(['django','contrib','auth','models.pyc']) + "'>,
options=[('pythonpath', None), ('settings', None), ('traceback', None)]")
self.assertOutput(out, "EXECUTE:AppCommand app=<module
'django.contrib.contenttypes.models'")
- self.assertOutput(out,
os.sep.join(['django','contrib','contenttypes','models.pyc']) + "'>,
options=[('pythonpath', None), ('settings', None), ('traceback', None)]")
+ self.assertOutput(out,
os.sep.join(['django','contrib','contenttypes','models.py']))
+ self.assertOutput(out, "'>, options=[('pythonpath', None),
('settings', None), ('traceback', None)]")
def test_app_command_invalid_appname(self):
"User AppCommands can execute when a single app name is provided"
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
