[poppler] regtest/HTMLReport.py

[Carlos Garcia Campos]

 regtest/HTMLReport.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 11f117cc71641b89783b207232171f850a2b64ff
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Thu Jun 4 10:51:36 2015 +0200

    regtest: Disable pretty diffs for text files in HTML reports
    
    difflib is entering in an infinite loop with some files, so disable it
    for now. We need to either fix that somehow or find a different way to
    generate pretty diffs of text files.

diff --git a/regtest/HTMLReport.py b/regtest/HTMLReport.py
index 89cb0e1..f582e74 100644
--- a/regtest/HTMLReport.py
+++ b/regtest/HTMLReport.py
@@ -127,8 +127,11 @@ class HTMLPrettyDiffText(HTMLPrettyDiff):
 def create_pretty_diff(backend):
     if backend.get_diff_ext() == '.diff.png':
         return HTMLPrettyDiffImage()
-    if backend.get_diff_ext() == '.diff':
-        return HTMLPrettyDiffText()
+    # Disable pretty diff for Text files for now, since HtmlDiff().make_file() is
+    # entering in an infinite loop with some files. We need to either fix that somehow or
+    # find a different way to generate pretty diffs of text files.
+    #if backend.get_diff_ext() == '.diff':
+    #    return HTMLPrettyDiffText()
     return None
 
 class BackendTestResult: