(Reland) Add failure screenshots and images to results detail.

build/android/pylib/instrumentation/instrumentation_test_instance.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 collections
 import copy
 import json
 import logging
 import os
 import pickle
@@ skipping 480 matching lines @@
 
     self._timeout_scale = None
     self._initializeTestControlAttributes(args)
 
     self._coverage_directory = None
     self._initializeTestCoverageAttributes(args)
 
     self._store_tombstones = False
     self._initializeTombstonesAttributes(args)
 
+    self._gs_results_bucket = None
+    self._should_save_images = None
     self._should_save_logcat = None
     self._initializeLogAttributes(args)
 
     self._edit_shared_prefs = []
     self._initializeEditPrefsAttributes(args)
 
     self._external_shard_index = args.test_launcher_shard_index
     self._total_external_shards = args.test_launcher_total_shards
 
   def _initializeApkAttributes(self, args, error_func):
@@ skipping 164 matching lines @@
     self._screenshot_dir = args.screenshot_dir
     self._timeout_scale = args.timeout_scale or 1
 
   def _initializeTestCoverageAttributes(self, args):
     self._coverage_directory = args.coverage_dir
 
   def _initializeTombstonesAttributes(self, args):
     self._store_tombstones = args.store_tombstones
 
   def _initializeLogAttributes(self, args):
+    # Will archive test images if we are given a GS bucket to store the results
+    # in and are given a results file to output the links to.
+    self._gs_results_bucket = args.gs_results_bucket
+    self._should_save_images = (

[jbudorick, 2017/04/29 01:12:25]

nit: do we need to save this separately?

[mikecase (-- gone --), 2017/05/03 21:25:14]

I guess I can just check for _gs_results_bucket. Should be fine.

+        bool(args.json_results_file) and bool(args.gs_results_bucket))
     self._should_save_logcat = bool(args.json_results_file)
 
   def _initializeEditPrefsAttributes(self, args):
     if not hasattr(args, 'shared_prefs_file') or not args.shared_prefs_file:
       return
     if not isinstance(args.shared_prefs_file, str):
       logging.warning("Given non-string for a filepath")
       return
 
     # json.load() loads strings as unicode, which causes issues when trying
@@ skipping 45 matching lines @@
 
   @property
   def external_shard_index(self):
     return self._external_shard_index
 
   @property
   def flags(self):
     return self._flags
 
   @property
+  def gs_results_bucket(self):
+    return self._gs_results_bucket
+
+  @property
+  def should_save_images(self):
+    return self._should_save_images
+
+  @property
   def should_save_logcat(self):
     return self._should_save_logcat
 
   @property
   def package_info(self):
     return self._package_info
 
   @property
   def screenshot_dir(self):
     return self._screenshot_dir
@@ skipping 122 matching lines @@
 
   @staticmethod
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
   #override
   def TearDown(self):
     pass