commit 3287ffb095f15f8707f8935850a8dd466d71e4f1
author Mike Bayer <mike_mp@zzzcomputing.com> Wed Mar 09 18:04:19 2016 -0500
committer Mike Bayer <mike_mp@zzzcomputing.com> Wed Mar 09 18:04:19 2016 -0500
tree 6b3c3aee8d3b22bba9f1c349d9e71e862bbae119
parent f9faef9ac1b530b59a61411d0accd949566420fa

- reduce the pygments strings we're searching for to accommodate for
changes in pygments formatting; we might be losing
a bit of what was tested here originally but we still assert pygments
is taking place.

test/test_exceptions.py

diff --git a/test/test_exceptions.py b/test/test_exceptions.py
index 3330a1f..8321b25 100644
--- a/test/test_exceptions.py
+++ b/test/test_exceptions.py
@@ -91,9 +91,7 @@
                 assert "".encode(sys.getdefaultencoding(),
                                         'htmlentityreplace') in html_error
             else:
-                assert '<pre>3</pre></div></td><td class="code">'\
-                        '<div class="syntax-highlighted"><pre><span '\
-                        'class="cp">${</span><span class="s">u&#39;'\
+                assert 'u&#39;'\
                         '&#x43F;&#x440;&#x438;&#x432;&#x435;&#x442;'\
                         '&#39;</span><span class="cp">}</span>'.encode(
                                 sys.getdefaultencoding(),
@@ -188,12 +186,8 @@
         ${self.body()}
         """)
 
-        assert '<div class="sourceline"><table class="syntax-highlightedtable">'\
-                '<tr><td class="linenos"><div class="linenodiv"><pre>3</pre>'\
-                '</div></td><td class="code"><div class="syntax-highlighted">'\
-                '<pre><span class="err">$</span><span class="p">{</span>'\
-                '<span class="n">foobar</span><span class="p">}</span>' in \
-            result_lines(l.get_template("foo.html").render_unicode())
+        assert '<div class="sourceline"><table class="syntax-highlightedtable">' in \
+            l.get_template("foo.html").render_unicode()
 
     @requires_no_pygments_exceptions
     def test_format_exceptions_no_pygments(self):
@@ -223,24 +217,12 @@
             l.put_string("foo.html", """# -*- coding: utf-8 -*-\n${u'привет' + foobar}""")
 
         if compat.py3k:
-            assert '<table class="error syntax-highlightedtable"><tr><td '\
-                    'class="linenos"><div class="linenodiv"><pre>2</pre>'\
-                    '</div></td><td class="code"><div class="error '\
-                    'syntax-highlighted"><pre><span class="cp">${</span>'\
-                    '<span class="s">&#39;привет&#39;</span> <span class="o">+</span> '\
-                    '<span class="n">foobar</span><span class="cp">}</span>'\
-                    '<span class="x"></span>' in \
-                result_lines(l.get_template("foo.html").render().decode('utf-8'))
+            assert '&#39;привет&#39;</span>' in \
+                l.get_template("foo.html").render().decode('utf-8')
         else:
-            assert '<table class="error syntax-highlightedtable"><tr><td '\
-                    'class="linenos"><div class="linenodiv"><pre>2</pre>'\
-                    '</div></td><td class="code"><div class="error '\
-                    'syntax-highlighted"><pre><span class="cp">${</span>'\
-                    '<span class="s">u&#39;&#x43F;&#x440;&#x438;&#x432;'\
-                    '&#x435;&#x442;&#39;</span> <span class="o">+</span> '\
-                    '<span class="n">foobar</span><span class="cp">}</span>'\
-                    '<span class="x"></span>' in \
-                result_lines(l.get_template("foo.html").render().decode('utf-8'))
+            assert 'u&#39;&#x43F;&#x440;&#x438;&#x432;'\
+                    '&#x435;&#x442;&#39;</span>' in \
+                l.get_template("foo.html").render().decode('utf-8')
 
     @requires_no_pygments_exceptions
     def test_utf8_format_exceptions_no_pygments(self):