Commit be6ca58d authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #7728 -- Modified the output check in the admin script tests. Checking... 

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.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 32b8c3e1

tests/regressiontests/admin_scripts/tests.py

+5 −3
Original line number Diff line number Diff line
@@ -801,7 +801,8 @@ class CommandTypes(AdminScriptTestCase): 
        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"
@@ -817,7 +818,8 @@ class CommandTypes(AdminScriptTestCase): 
        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"