Merge pull request #29 from plone/fix-tests

Use formencode's xml_compare method to compare test results. This solves test failures on several systems.
plone · Jun 19, 2014 · 62ae47f · 62ae47f
2 parents b5d3577 + 2b68953
commit 62ae47f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 1.0.6 (unreleased)
 ------------------
 
+* Use formencode's xml_compare method to compare test results. This solves test
+  failures on several systems.
+  [timo]
+
 * Also evaluate if-not-content. However, we are at risk of replicating
   apply-conditions.xsl in it's entirety. this needs refactoring.
   [lentinj]

diff --git a/lib/diazo/tests/esi/output.html b/lib/diazo/tests/esi/output.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns:esi="http://www.edge-delivery.org/esi/1.0">
   <body>
     <h1>theme</h1>
     <esi:include src="extra.html?;filter_xpath=//*[@id%20=%20'something']"></esi:include>

diff --git a/lib/diazo/tests/esi/theme.html b/lib/diazo/tests/esi/theme.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html>
     <body>
         <h1>theme</h1>
         <div id="include">theme content</div>

diff --git a/lib/diazo/tests/style-script-quoting-1/output.html b/lib/diazo/tests/style-script-quoting-1/output.html
@@ -8,8 +8,8 @@
             body > h1 { color: red; }
         </style>
     <script type="text/javascript">
-            var x = '<div>';
-        </script>
+            var x = 'foo';
+    </script>
     <style type="text/css">
         /* From the content */
         div > p { color: blue; } 
@@ -21,7 +21,7 @@ <h1>Title</h1>
       <p>Some text</p>
     </div>
     <script type="text/javascript">
-            var y = '<span>';
+            var y = 'bar';
         </script>
   </body>
 </html>
diff --git a/lib/diazo/tests/style-script-quoting-1/theme.html b/lib/diazo/tests/style-script-quoting-1/theme.html
@@ -7,14 +7,14 @@
             body > h1 { color: red; }
         </style>
         <script type="text/javascript">
-            var x = '<div>';
+            var x = 'foo';
         </script>
     </head>
     <body>
         <h1>Title</h1>
         <div id="content"></div>
         <script type="text/javascript">
-            var y = '<span>';
+            var y = 'bar';
         </script>
     </body>
 </html>
diff --git a/lib/diazo/tests/tests.py b/lib/diazo/tests/tests.py
@@ -15,6 +15,8 @@
 import diazo.run
 
 from diazo.utils import quote_param
+from formencode.doctest_xml_compare import xml_compare
+
 
 if __name__ == '__main__':
     __file__ = sys.argv[0]
@@ -157,7 +159,7 @@ def testAll(self):
         if os.path.exists(outputfn):
             old = open(outputfn).read()
             new = self.themed_string
-            if old != new:
+            if not xml_compare(etree.fromstring(old.strip()), etree.fromstring(new.strip())):
                 # if self.writefiles:
                 #    open(outputfn + '.old', 'w').write(old)
                 for line in difflib.unified_diff(old.split('\n'),

diff --git a/setup.py b/setup.py
@@ -29,7 +29,12 @@
         'experimental.cssselect'],
     extras_require={
         'wsgi': ['repoze.xmliter>=0.3', 'WebOb'],
-        'test': ['repoze.xmliter>=0.3', 'WebOb', 'unittest2']},
+        'test': [
+            'formencode',
+            'repoze.xmliter>=0.3',
+            'WebOb',
+            'unittest2'
+        ]},
     entry_points="""
         [console_scripts]
         diazocompiler = diazo.compiler:main