Merge catapult latest

catapult_build/build_steps.py

@@ -37,7 +37,9 @@
         'additional_args': [
             '--no-install-hooks',
             '--no-use-local-chrome',
-            '--channel=stable'
+            '--channel=stable',
+            '--timeout-sec=120',
+            '--timeout-retries=2'
         ],
         'outputs_presentation_json': True,
         'disabled': ['android'],
@@ -48,7 +50,9 @@
         'additional_args': [
             '--no-install-hooks',
             '--no-use-local-chrome',
-            '--channel=canary'
+            '--channel=canary',
+            '--timeout-sec=120',
+            '--timeout-retries=2'
         ],
         'outputs_presentation_json': True,
         'disabled': ['android'],
@@ -112,7 +116,8 @@
         'path': 'catapult_build/fetch_telemetry_deps_and_run_tests',
         'additional_args': [
             '--browser=reference',
-            '--start-xvfb'
+            '--start-xvfb',
+            '-v',
         ],
         'uses_sandbox_env': True,
         'disabled': ['android'],
@@ -123,7 +128,8 @@
         'additional_args': [
             '--browser=reference',
             '--device=android',
-            '--jobs=1'
+            '--jobs=1',
+            '-v',
         ],
         'uses_sandbox_env': True,
         'disabled': ['win', 'mac', 'linux']
@@ -134,6 +140,7 @@
         'additional_args': [
             'BrowserTest',
             '--browser=reference',
+            '-v',
         ],
         'uses_sandbox_env': True,
         'disabled': ['android', 'linux'],  # TODO(nedn): enable this on linux
@@ -145,6 +152,7 @@
             '--no-install-hooks',
             '--no-use-local-chrome',
             '--channel=stable',
+            '--timeout-sec=900',
         ],
         'outputs_presentation_json': True,
         'disabled': ['android'],
@@ -156,6 +164,7 @@
             '--no-install-hooks',
             '--no-use-local-chrome',
             '--channel=canary',
+            '--timeout-sec=900',
         ],
         'outputs_presentation_json': True,
         'disabled': ['android'],

catapult_build/dev_server.py

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import print_function
+
 import argparse
 import json
 import os
@@ -82,6 +84,15 @@ def post(self, *args, **kwargs):  # pylint: disable=unused-argument
       self.app.server.please_exit(exit_code)
     return self.response.write('')
 
+class TestsErrorHandler(webapp2.RequestHandler):
+  def post(self, *args, **kwargs):
+    del args, kwargs
+    msg = self.request.body
+    sys.stderr.write(msg + '\n')
+    exit_code = 1
+    if hasattr(self.app.server, 'please_exit'):
+      self.app.server.please_exit(exit_code)
+    return self.response.write('')
 
 class DirectoryListingHandler(webapp2.RequestHandler):
   def get(self, *args, **kwargs):  # pylint: disable=unused-argument
@@ -198,7 +209,9 @@ def _InitFromArgs(self, args):
           Route('/%s/notify_test_result' % pd.GetName(),
                 TestResultHandler),
           Route('/%s/notify_tests_completed' % pd.GetName(),
-                TestsCompletedHandler)
+                TestsCompletedHandler),
+          Route('/%s/notify_test_error' % pd.GetName(),
+                TestsErrorHandler)
       ]
 
     for pd in self.pds:
@@ -276,6 +289,7 @@ def ServeForever():
       # allow CTRL+C to shutdown
       return 255
 
+    print("Exiting dev server")
     if len(exit_code_attempt) == 1:
       return exit_code_attempt[0]
     # The serve_forever returned for some reason separate from