[Checkins] SVN: zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_ Accept \r\n line endings in tests
Marius Gedminas
cvs-admin at zope.org
Thu Mar 7 16:01:10 UTC 2013
Log message for revision 130061:
Accept \r\n line endings in tests
I'm not 100% this is the right thing to do. Perhaps page templates
should normalize OS line endings to \n?
Changed:
U zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_binding.py
U zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_nested.py
-=-
Modified: zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_binding.py
===================================================================
--- zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_binding.py 2013-03-07 15:47:15 UTC (rev 130060)
+++ zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_binding.py 2013-03-07 16:01:10 UTC (rev 130061)
@@ -41,9 +41,9 @@
def test_binding(self):
from zope.publisher.browser import TestRequest
comp = PTComponent(Content(), TestRequest())
- self.assertEqual(comp.index(), "42\n")
- self.assertEqual(comp.nothing(), "\n")
- self.assertEqual(comp.default(), "42\n")
+ self.assertEqual(comp.index().replace("\r\n", "\n"), "42\n")
+ self.assertEqual(comp.nothing().replace("\r\n", "\n"), "\n")
+ self.assertEqual(comp.default().replace("\r\n", "\n"), "42\n")
def test_suite():
return unittest.makeSuite(BindingTestCase)
Modified: zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_nested.py
===================================================================
--- zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_nested.py 2013-03-07 15:47:15 UTC (rev 130060)
+++ zope.app.pagetemplate/trunk/src/zope/app/pagetemplate/tests/test_nested.py 2013-03-07 16:01:10 UTC (rev 130061)
@@ -55,7 +55,7 @@
namespace['outer'] = outer
namespace['intermediate'] = intermediate
result = inner.pt_render(namespace)
- self.assertEquals(result, EXPECTED)
+ self.assertEquals(result.replace("\r\n", "\n"), EXPECTED)
def test_suite():
More information about the checkins
mailing list