diff options
| author | Ramiro Morales <ramiro@rmorales.net> | 2013-10-23 07:59:06 -0300 |
|---|---|---|
| committer | Ramiro Morales <ramiro@rmorales.net> | 2013-10-23 08:19:42 -0300 |
| commit | aefc1d4e65c04f3fc6863a2e0563957c3b1e726b (patch) | |
| tree | 78351a8cf714c5ba3265d08168b88d350108731a /tests/admin_scripts | |
| parent | ae48d77ef8e14dae76fddcd5a677b897c7c7c4ae (diff) | |
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.
Diffstat (limited to 'tests/admin_scripts')
| -rw-r--r-- | tests/admin_scripts/tests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 7837a60003..e4787466d6 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=<module 'django.contrib.auth.models'") - self.assertOutput(out, os.sep.join(['django', 'contrib', 'auth', 'models.py'])) + self.assertOutput(out, "module 'django.contrib.auth.models' from") self.assertOutput(out, str_prefix("'>, 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=<module 'django.contrib.auth.models'") - self.assertOutput(out, os.sep.join(['django', 'contrib', 'auth', 'models.py'])) + self.assertOutput(out, "module 'django.contrib.auth.models' from") self.assertOutput(out, str_prefix("'>, options=[('no_color', False), ('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity', %(_)s'1')]")) self.assertOutput(out, "EXECUTE:AppCommand app=<module 'django.contrib.contenttypes.models'") - self.assertOutput(out, os.sep.join(['django', 'contrib', 'contenttypes', 'models.py'])) + self.assertOutput(out, "module 'django.contrib.contenttypes.models' from") self.assertOutput(out, str_prefix("'>, options=[('no_color', False), ('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity', %(_)s'1')]")) def test_app_command_invalid_appname(self): |