introduce recipe_exception in result.proto

recipe_engine/unittests/run_test.py

 #!/usr/bin/env python
 # Copyright 2014 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import json
 import os
 import re
 import subprocess
 import unittest
@@ skipping 27 matching lines @@
     os.environ['RANDOM_MULTILINE_ENV'] = 'foo\nbar\nbaz\n'
     try:
       return (
           ['python', script_path] + eng_args + ['run', recipe] + proplist)
     finally:
       os.environ[requests_ssl.ENV_VAR_IGNORE] = prev_ignore
 
   def _test_recipe(self, recipe, properties=None):
     proc = subprocess.Popen(
         self._run_cmd(recipe, properties), stdout=subprocess.PIPE)
-    proc.communicate()
-    self.assertEqual(0, proc.returncode, '%d != %d when testing %s' % (
-        0, proc.returncode, recipe))
+    stdout, stderr = proc.communicate()
+    self.assertEqual(
+        0, proc.returncode,
+        ('%d != %d when testing %s\nstdout: %s\nstderr: %s' % (
+          0, proc.returncode, recipe, stdout, stderr)))
 
   def test_examples(self):
     tests = [
       ['step:example'],
       ['path:example'],
       ['raw_io:example'],
       ['python:example'],
       ['json:example'],
       ['uuid:example'],
 
       ['engine_tests/depend_on/top', {'to_pass': 42}],
       ['engine_tests/functools_partial'],
     ]
     for test in tests:
       self._test_recipe(*test)
 
   def test_bad_subprocess(self):
     now = time.time()
     self._test_recipe('engine_tests/bad_subprocess')
     after = time.time()
 
     # Test has a daemon that holds on to stdout for 30s, but the daemon's parent
     # process (e.g. the one that recipe engine actually runs) quits immediately.
     # If this takes longer than 5 seconds to run, we consider it failed.
     self.assertLess(after - now, 5)
 
-
   def test_nonexistent_command(self):
     subp = subprocess.Popen(
         self._run_cmd('engine_tests/nonexistent_command'),
         stdout=subprocess.PIPE)
     stdout, _ = subp.communicate()
     self.assertRegexpMatches(stdout, '(?m)^@@@STEP_EXCEPTION@@@$')
     self.assertRegexpMatches(stdout, 'OSError')
     self.assertEqual(255, subp.returncode, stdout)
 
   def test_nonexistent_command_new(self):
@@ skipping 108 matching lines @@
     self.assertRegexpMatches(stdout, r'(?m)^@@@BUILD_STEP@pippy@@@$')
     # Before 'Subannotate me' we expect an extra STEP_CURSOR to reset the
     # state.
     self.assertRegexpMatches(stdout,
         r'(?m)^@@@STEP_CURSOR@Subannotate me@@@\n@@@STEP_CLOSED@@@$')
 
 
 if __name__ == '__main__':
   unittest.TestCase.maxDiff = None
   unittest.main()