From adb80f82503d749ccc2e4ce3172b5227ac64396d Mon Sep 17 00:00:00 2001 From: Malthe Borch Date: Fri, 25 Feb 2011 13:07:58 +0100 Subject: Strip newline before test (this is to be compatible with Chameleon 2.x which ensures a trailing newline character after output). --- pyramid/tests/test_chameleon_zpt.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pyramid/tests/test_chameleon_zpt.py b/pyramid/tests/test_chameleon_zpt.py index 4fceb809c..1b015e158 100644 --- a/pyramid/tests/test_chameleon_zpt.py +++ b/pyramid/tests/test_chameleon_zpt.py @@ -54,7 +54,7 @@ class ZPTTemplateRendererTests(Base, unittest.TestCase): instance = self._makeOne(minimal, lookup) result = instance({}, {}) self.failUnless(isinstance(result, unicode)) - self.assertEqual(result, + self.assertEqual(result.rstrip('\n'), '
\n
') @skip_on('java', 'pypy') @@ -129,7 +129,7 @@ class ZPTTemplateRendererTests(Base, unittest.TestCase): instance = self._makeOne(minimal, lookup) result = instance.implementation()() self.failUnless(isinstance(result, unicode)) - self.assertEqual(result, + self.assertEqual(result.rstrip('\n'), '
\n
') @@ -143,7 +143,7 @@ class RenderTemplateTests(Base, unittest.TestCase): minimal = self._getTemplatePath('minimal.pt') result = self._callFUT(minimal) self.failUnless(isinstance(result, unicode)) - self.assertEqual(result, + self.assertEqual(result.rstrip('\n'), '
\n
') class RenderTemplateToResponseTests(Base, unittest.TestCase): @@ -157,8 +157,8 @@ class RenderTemplateToResponseTests(Base, unittest.TestCase): result = self._callFUT(minimal) from webob import Response self.failUnless(isinstance(result, Response)) - self.assertEqual(result.app_iter, - ['
\n
']) + self.assertEqual(result.app_iter[0].rstrip('\n'), + '
\n
') self.assertEqual(result.status, '200 OK') self.assertEqual(len(result.headerlist), 2) -- cgit v1.2.3