Django

Code

Changeset 7915

Show
Ignore:
Timestamp:
07/13/08 03:57:30 (4 months ago)
Author:
russellm
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/tests/regressiontests/admin_scripts/tests.py

    r7888 r7915  
    802802        self.assertNoOutput(err) 
    803803        self.assertOutput(out, "EXECUTE:AppCommand app=<module 'django.contrib.auth.models'") 
    804         self.assertOutput(out, os.sep.join(['django','contrib','auth','models.pyc']) + "'>, options=[('pythonpath', None), ('settings', None), ('traceback', None)]") 
    805  
     804        self.assertOutput(out, os.sep.join(['django','contrib','auth','models.py']))  
     805        self.assertOutput(out, "'>, options=[('pythonpath', None), ('settings', None), ('traceback', None)]") 
     806                 
    806807    def test_app_command_no_apps(self): 
    807808        "User AppCommands raise an error when no app name is provided" 
    …… 
    818819        self.assertOutput(out, os.sep.join(['django','contrib','auth','models.pyc']) + "'>, options=[('pythonpath', None), ('settings', None), ('traceback', None)]") 
    819820        self.assertOutput(out, "EXECUTE:AppCommand app=<module 'django.contrib.contenttypes.models'") 
    820         self.assertOutput(out, os.sep.join(['django','contrib','contenttypes','models.pyc']) + "'>, options=[('pythonpath', None), ('settings', None), ('traceback', None)]") 
     821        self.assertOutput(out, os.sep.join(['django','contrib','contenttypes','models.py'])) 
     822        self.assertOutput(out, "'>, options=[('pythonpath', None), ('settings', None), ('traceback', None)]") 
    821823 
    822824    def test_app_command_invalid_appname(self):