summaryrefslogtreecommitdiff
path: root/tests/admin_scripts/tests.py
diff options
context:
space:
mode:
authorRamiro Morales <ramiro@rmorales.net>2013-09-29 14:26:03 -0300
committerRamiro Morales <cramm0@gmail.com>2013-09-29 22:57:04 -0300
commitc4468e0619ef45cae7914b2ebf8357951342dd72 (patch)
treeee23772b16e2bf1c0b6956c62e38fd2e1705960d /tests/admin_scripts/tests.py
parent5d72ce061f79f09310b1fcb523c23e6d259c02de (diff)
[1.6.x] Modified test added in 3afb5916b2 so it doesn't fail on Windows.
Refs #18091. 12ca312e1b from master.
Diffstat (limited to 'tests/admin_scripts/tests.py')
-rw-r--r--tests/admin_scripts/tests.py7
1 files 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):