8123: Ignore crunchstat "caught signal:" log.

diff --git a/tools/crunchstat-summary/crunchstat_summary/summarizer.py b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
index f648e9b6b65aa47a24ca19a1f1d4f1a30d16a4a7..93e018ddfde315b0bd84afd6d9439f5854ed11c8 100644 (file)
--- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py
+++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
@@ -95,7 +95,7 @@ class Summarizer(object):
             if m.group('category').endswith(':'):
                 # "stderr crunchstat: notice: ..."
                 continue
-            elif m.group('category') == 'error':
+            elif m.group('category') in ('error', 'caught'):
                 continue
             elif m.group('category') == 'read':
                 # "stderr crunchstat: read /proc/1234/net/dev: ..."

diff --git a/tools/crunchstat-summary/tests/crunchstat_error_messages.txt b/tools/crunchstat-summary/tests/crunchstat_error_messages.txt
index 131e985c4295bb88af841d919060400526daec19..bf6dd5ceaff9a0e689e9caa7afb6009c724261a5 100644 (file)
--- a/tools/crunchstat-summary/tests/crunchstat_error_messages.txt
+++ b/tools/crunchstat-summary/tests/crunchstat_error_messages.txt
@@ -4,3 +4,6 @@
 2016-01-07_00:15:34 tb05z-8i9sb-khsk5rmf4xjdcbl 20819 0 stderr 
 2016-01-07_00:15:34 tb05z-8i9sb-khsk5rmf4xjdcbl 20819 0 stderr new error message:
 2016-01-07_00:15:34 tb05z-8i9sb-khsk5rmf4xjdcbl 20819 0 stderr crunchstat: error reading /proc/3305/net/dev: open /proc/3305/net/dev: no such file or directory
+2016-01-07_00:15:34 tb05z-8i9sb-khsk5rmf4xjdcbl 20819 0 stderr
+2016-01-07_00:15:34 tb05z-8i9sb-khsk5rmf4xjdcbl 20819 0 stderr cancelled job:
+2016-01-07_00:15:34 tb05z-8i9sb-khsk5rmf4xjdcbl 20819 0 stderr crunchstat: caught signal: interrupt