Merge branch 'pydiffx/release-1.x'

beanbaginc · Sep 3, 2021 · 69f212c · 69f212c
2 parents 2c6a66b + fe417d4
commit 69f212c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/python/pydiffx/dom/objects.py b/python/pydiffx/dom/objects.py
@@ -732,7 +732,7 @@ def generate_stats(self):
         This should only be run once the change is complete. Normally,
         callers will want to call :py:meth:`DiffX.generate_stats` instead.
         """
-        if self.diff is None or self.diff_type == DiffType.BINARY:
+        if not self.diff or self.diff_type == DiffType.BINARY:
             return
 
         if self.diff_line_endings:

diff --git a/python/pydiffx/tests/test_dom_objects.py b/python/pydiffx/tests/test_dom_objects.py
@@ -81,7 +81,7 @@ def run_invalid_option_value_test(self, option_name, value,
             setattr(section, option_name, value)
 
 
-class DiffXTests(BaseSectionTestCase):
+class DiffXTests(kgb.SpyAgency, BaseSectionTestCase):
     """Unit tests for pydiffx.dom.objects.DiffX."""
 
     section_cls = DiffX
@@ -959,6 +959,21 @@ def test_generate_stats_merges(self):
                 'special': 123,
             })
 
+    def test_generate_stats_empty_diff(self):
+        """Testing DiffX.generate_stats with an empty diff"""
+        self.spy_on(dom_objects_logger.error)
+
+        diffx = DiffX()
+        change_section = diffx.add_change()
+        change_section.add_file(diff=b'')
+        change_section.add_file()
+
+        diffx.generate_stats()
+
+        # Empty diffs used to cause errors to be logged. This should no longer
+        # be hit.
+        self.assertSpyNotCalled(dom_objects_logger.error)
+
     def test_repr(self):
         """Testing DiffX.__repr__"""
         diffx = DiffX(