diff options
| author | Malthe Borch <mborch@gmail.com> | 2011-02-25 13:07:58 +0100 |
|---|---|---|
| committer | Malthe Borch <mborch@gmail.com> | 2011-02-25 13:07:58 +0100 |
| commit | adb80f82503d749ccc2e4ce3172b5227ac64396d (patch) | |
| tree | 91af92471561a3884f19a2bc631615cdf1eaea4d | |
| parent | a5aa238334ec11d3973bbf3fd3f36b7246909d93 (diff) | |
| download | pyramid-adb80f82503d749ccc2e4ce3172b5227ac64396d.tar.gz pyramid-adb80f82503d749ccc2e4ce3172b5227ac64396d.tar.bz2 pyramid-adb80f82503d749ccc2e4ce3172b5227ac64396d.zip | |
Strip newline before test (this is to be compatible with Chameleon 2.x which ensures a trailing newline character after output).
| -rw-r--r-- | pyramid/tests/test_chameleon_zpt.py | 10 |
1 files 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'), '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>') @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'), '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>') @@ -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'), '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>') 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, - ['<div xmlns="http://www.w3.org/1999/xhtml">\n</div>']) + self.assertEqual(result.app_iter[0].rstrip('\n'), + '<div xmlns="http://www.w3.org/1999/xhtml">\n</div>') self.assertEqual(result.status, '200 OK') self.assertEqual(len(result.headerlist), 2) |