Code review comment for lp:~thumper/launchpad/log-diffstat-error-and-continue

Revision history for this message
Tim Penhey (thumper) wrote :

Sounds good. Thanks.

=== modified file 'lib/lp/code/model/diff.py'
--- lib/lp/code/model/diff.py 2009-09-25 02:54:56 +0000
+++ lib/lp/code/model/diff.py 2009-09-25 03:40:24 +0000
@@ -161,8 +161,7 @@
         try:
             diffstat = cls.generateDiffstat(diff_content_bytes)
         except Exception:
- info = sys.exc_info()
- getUtility(IErrorReportingUtility).raising(info)
+ getUtility(IErrorReportingUtility).raising(sys.exc_info())
             # Set the diffstat to be empty.
             diffstat = {}
         return cls(diff_text=diff_text, diff_lines_count=diff_lines_count,

=== modified file 'lib/lp/code/model/tests/test_diff.py'
--- lib/lp/code/model/tests/test_diff.py 2009-09-25 02:54:56 +0000
+++ lib/lp/code/model/tests/test_diff.py 2009-09-25 03:41:21 +0000
@@ -151,7 +151,8 @@
                          diff.diffstat)

     def test_fromFile_withError(self):
- # If the diffstat isn't real, we want to record an oops but continue.
+ # If the diff is formatted such that generating the diffstat fails, we
+ # want to record an oops but continue.
         last_oops_id = errorlog.globalErrorUtility.lastid
         diff_bytes = "not a real diff"
         diff = Diff.fromFile(StringIO(diff_bytes), len(diff_bytes))

« Back to merge proposal