From c4468e0619ef45cae7914b2ebf8357951342dd72 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Sun, 29 Sep 2013 14:26:03 -0300 Subject: [PATCH] [1.6.x] Modified test added in 3afb5916b2 so it doesn't fail on Windows. Refs #18091. 12ca312e1b from master. --- tests/admin_scripts/tests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 2f399acb23..67cb3343f6 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -1679,9 +1679,10 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase): self.assertNoOutput(err) self.assertTrue(os.path.isdir(testproject_dir)) path = os.path.join(testproject_dir, 'ticket-18091-non-ascii-template.txt') - with codecs.open(path, 'r', 'utf-8') as f: - self.assertEqual(f.read(), - 'Some non-ASCII text for testing ticket #18091:\nüäö €\n') + with codecs.open(path, 'r', encoding='utf-8') as f: + self.assertEqual(f.read().splitlines(False), [ + 'Some non-ASCII text for testing ticket #18091:', + 'üäö €']) class DiffSettings(AdminScriptTestCase):