diff options
| author | Chris McDonough <chrism@plope.com> | 2011-02-26 12:04:27 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-02-26 12:04:27 -0500 |
| commit | 8326c68388ecac91cdcb1dce268a61362be2e4c8 (patch) | |
| tree | 869d8eb65a14c9383f4ed911b6b4d5549050d920 | |
| parent | fe164c184edaf810b3c1b4afb757672e2befa2ec (diff) | |
| parent | 0377a214e84a5f38838eae4112957a2901475f1a (diff) | |
| download | pyramid-8326c68388ecac91cdcb1dce268a61362be2e4c8.tar.gz pyramid-8326c68388ecac91cdcb1dce268a61362be2e4c8.tar.bz2 pyramid-8326c68388ecac91cdcb1dce268a61362be2e4c8.zip | |
Merge branch 'malthe-master'
| -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) |