# HG changeset patch # User David Douard # Date 1418306543 -3600 # Node ID 4e9738f5c7988e08715bbbe0d09b5c5e19e925ef # Parent 6f4b4567b77d9220264d906defa3c3f933fd1e08 [test] fixes to make tests pass with recent lxml lxml (on jessie at least, ie. 3.4.0) does not remove endlines anymore. diff -r 6f4b4567b77d -r 4e9738f5c798 test/unittest_entity.py --- a/test/unittest_entity.py Wed Dec 17 10:55:53 2014 +0100 +++ b/test/unittest_entity.py Thu Dec 11 15:02:23 2014 +0100 @@ -590,8 +590,8 @@ def test_printable_value_string(self): with self.admin_access.web_request() as req: e = req.create_entity('Card', title=u'rest test', - content=u'du :eid:`1:*ReST*`', - content_format=u'text/rest') + content=u'du :eid:`1:*ReST*`', + content_format=u'text/rest') self.assertEqual(e.printable_value('content'), '

du *ReST*

') e.cw_attr_cache['content'] = 'du html users' @@ -600,8 +600,8 @@ 'du html users') e.cw_attr_cache['content'] = 'du *texte*' e.cw_attr_cache['content_format'] = 'text/plain' - self.assertEqual(e.printable_value('content'), - '

\ndu *texte*

') + self.assertEqual(e.printable_value('content').replace("\n", ""), + '

du *texte*

') e.cw_attr_cache['title'] = 'zou' e.cw_attr_cache['content'] = '''\ a title diff -r 6f4b4567b77d -r 4e9738f5c798 test/unittest_uilib.py --- a/test/unittest_uilib.py Wed Dec 17 10:55:53 2014 +0100 +++ b/test/unittest_uilib.py Thu Dec 11 15:02:23 2014 +0100 @@ -178,9 +178,9 @@ self.assertMultiLineEqual(uilib.soup2xhtml(incoming, 'ascii'), expected) def test_unknown_namespace(self): - incoming = ''' - - + incoming = '''
XXXXXXX
\ +\ +\
XXXXXXX
''' expected = '''\ \