Move screenshot capture to Java-side.

build/android/pylib/local/device/local_device_instrumentation_test_run.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 import posixpath
 import re
 import time
 
@@ skipping 114 matching lines @@
       def set_debug_app():
         # Set debug app in order to enable reading command line flags on user
         # builds
         if self._test_instance.flags:
           if not self._test_instance.package_info:
             logging.error("Couldn't set debug app: no package info")
           elif not self._test_instance.package_info.package:
             logging.error("Couldn't set debug app: no package defined")
           else:
             dev.RunShellCommand(['am', 'set-debug-app', '--persistent',
-                                  self._test_instance.package_info.package],
+                                 self._test_instance.package_info.package],
                                 check_return=True)
       @trace_event.traced
       def edit_shared_prefs():
         for pref in self._test_instance.edit_shared_prefs:
           prefs = shared_prefs.SharedPrefs(dev, pref['package'],
                                            pref['filename'])
           prefs.Load()
           for key in pref.get('remove', []):
             try:
               prefs.Remove(key)
@@ skipping 227 matching lines @@
         if r.GetType() == base_test_result.ResultType.UNKNOWN:
           r.SetType(base_test_result.ResultType.CRASH)
 
     # Handle failures by:
     #   - optionally taking a screenshot
     #   - logging the raw output at INFO level
     #   - clearing the application state while persisting permissions
     if any(r.GetType() not in (base_test_result.ResultType.PASS,
                                base_test_result.ResultType.SKIP)
            for r in results):
       with contextlib_ext.Optional(

[jbudorick, 2017/05/08 17:08:39]

At this point, perhaps we should pull the screenshot logic into its own function
that gets called here.

[mikecase (-- gone --), 2017/05/08 18:35:31]

Done, moved screenshot logic into new function.

           tempfile_ext.NamedTemporaryDirectory(),
           self._test_instance.screenshot_dir is None and
               self._test_instance.gs_results_bucket) as screenshot_host_dir:
         screenshot_host_dir = (
             self._test_instance.screenshot_dir or screenshot_host_dir)
+
         if screenshot_host_dir:
-          file_name = '%s-%s.png' % (
-              test_display_name,
-              time.strftime('%Y%m%dT%H%M%S-UTC', time.gmtime()))
-          screenshot_file = device.TakeScreenshot(
-              os.path.join(screenshot_host_dir, file_name))
-          logging.info(
-              'Saved screenshot for %s to %s.',
-              test_display_name, screenshot_file)
-          if self._test_instance.gs_results_bucket:
-            link = google_storage_helper.upload(
-                google_storage_helper.unique_name('screenshot', device=device),
-                screenshot_file,
-                bucket=self._test_instance.gs_results_bucket + '/screenshots')
-            for result in results:
-              result.SetLink('post_test_screenshot', link)
+          screenshot_device_file = posixpath.join(
+              device.GetExternalStoragePath(),
+              'chromium_tests_output_root',
+              instrumentation_test_instance.FAILURE_SCREENSHOT_FILE)
+          screenshot_host_file = os.path.join(
+              screenshot_host_dir,
+              '%s-%s.png' % (
+                  test_display_name,
+                  time.strftime('%Y%m%dT%H%M%S-UTC', time.gmtime())))
+          if device.FileExists(screenshot_device_file):
+            try:
+              device.PullFile(screenshot_device_file, screenshot_host_file)
+            finally:
+              device.RemovePath(screenshot_device_file)
+
+            logging.info(
+                'Saved screenshot for %s to %s.',
+                test_display_name, screenshot_host_file)
+            if self._test_instance.gs_results_bucket:
+              link = google_storage_helper.upload(
+                  google_storage_helper.unique_name(
+                      'screenshot', device=device),
+                  screenshot_host_file,
+                  bucket=('%s/screenshots' %
+                          self._test_instance.gs_results_bucket))
+              for result in results:
+                result.SetLink('post_test_screenshot', link)
 
       logging.info('detected failure in %s. raw output:', test_display_name)
       for l in output:
         logging.info('  %s', l)
       if (not self._env.skip_clear_data
           and self._test_instance.package_info):
         permissions = (
             self._test_instance.apk_under_test.GetPermissions()
             if self._test_instance.apk_under_test
             else None)
@@ skipping 55 matching lines @@
       if k in annotations:
         timeout = v
         break
     else:
       logging.warning('Using default 1 minute timeout for %s', test_name)
       timeout = 60
 
     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
 
     return timeout