Merge pull request mozilla-services#2871 from twobraids/no-newline-jit

NO BUG - removed LF from output of jit categorizer
mbrukman · Jun 26, 2015 · ef61683 · ef61683
2 parents fdd528a + 4d4f95d
commit ef61683
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/socorro/processor/breakpad_transform_rules.py b/socorro/processor/breakpad_transform_rules.py
@@ -708,7 +708,7 @@ def _predicate(self, raw_crash, raw_dumps, processed_crash, proc_meta):
     #--------------------------------------------------------------------------
     def _interpret_external_command_output(self, fp, processor_meta):
         try:
-            return fp.read()
+            result =  fp.read()
         except IOError, x:
             processor_meta.processor_notes.append(
                 "%s unable to read external command output: %s" % (
@@ -717,3 +717,8 @@ def _interpret_external_command_output(self, fp, processor_meta):
                 )
             )
             return ''
+        try:
+            return result.strip()
+        except AttributeError, x:
+            # there's no strip method
+            return result
diff --git a/socorro/unittest/processor/test_breakpad_transform_rules.py b/socorro/unittest/processor/test_breakpad_transform_rules.py
@@ -676,7 +676,7 @@ def test_stackwalker_fails(self, mocked_subprocess_module):
 
         mocked_subprocess_handle = \
             mocked_subprocess_module.Popen.return_value
-        mocked_subprocess_handle.stdout.read.return_value = '{}'
+        mocked_subprocess_handle.stdout.read.return_value = '{}\n'
         mocked_subprocess_handle.wait.return_value = 124
 
         rule = BreakpadStackwalkerRule2015(config)