From aefc1d4e65c04f3fc6863a2e0563957c3b1e726b Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Wed, 23 Oct 2013 07:59:06 -0300 Subject: [PATCH] Workaround admin scripts test failures on Windows+Python 3. Change strategy used to examine instrumented output to acommodate the fact that on Windows, where the path separator is '\', repr() of Python modules has changed in Python 3 to use escaped backslashes in the FS path section (e.g. 'C:\\python3x\\Lib\\site-packages\\django\\contrib\\auth\\models.py') without having to special-case based on platform. --- tests/admin_scripts/tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 7837a60003d..e4787466d63 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -1409,7 +1409,7 @@ class CommandTypes(AdminScriptTestCase): out, err = self.run_manage(args) self.assertNoOutput(err) self.assertOutput(out, "EXECUTE:AppCommand app=, options=[('no_color', False), ('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity', %(_)s'1')]")) def test_app_command_no_apps(self): @@ -1424,10 +1424,10 @@ class CommandTypes(AdminScriptTestCase): out, err = self.run_manage(args) self.assertNoOutput(err) self.assertOutput(out, "EXECUTE:AppCommand app=, options=[('no_color', False), ('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity', %(_)s'1')]")) self.assertOutput(out, "EXECUTE:AppCommand app=, options=[('no_color', False), ('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity', %(_)s'1')]")) def test_app_command_invalid_appname(self):