Added tombstones in instrumentation tests results.

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

Index: build/android/pylib/local/device/local_device_instrumentation_test_run.py
diff --git a/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
index 26d10f4d1d7ed797a4682a0acae6ff13b382281e..2e5dc42cbf80d7ad3c9ddf7a3e9118f209d557e4 100644
--- a/build/android/pylib/local/device/local_device_instrumentation_test_run.py
+++ b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
@@ -7,6 +7,7 @@ import os
 import posixpath
 import re
 import time
+import tombstones

[jbudorick, 2016/08/08 17:55:25]

nit: This shouldn't be with the system imports. Put it down w/ devil and pylib.

[BigBossZhiling, 2016/08/08 23:14:54]

Done.

 
 from devil.android import device_errors
 from devil.android import flag_changer
@@ -17,6 +18,7 @@ from pylib.local.device import local_device_environment
 from pylib.local.device import local_device_test_run
 
 
+

[jbudorick, 2016/08/08 17:55:25]

?

[BigBossZhiling, 2016/08/08 23:14:54]

Done.

 TIMEOUT_ANNOTATIONS = [
   ('Manual', 10 * 60 * 60),
   ('IntegrationTest', 30 * 60),
@@ -143,6 +145,8 @@ class LocalDeviceInstrumentationTestRun(
       else:
         for step in steps:
           step()
+      if self._test_instance.store_tombstones:
+        tombstones.ClearAllTombstones(dev)
 
     self._env.parallel_devices.pMap(
         individual_device_set_up,
@@ -329,6 +333,15 @@ class LocalDeviceInstrumentationTestRun(
           self._test_instance.coverage_directory)
       device.RunShellCommand('rm -f %s' % os.path.join(coverage_directory,
           '*'))
+    if self._test_instance.store_tombstones:
+      for result in results:
+        if result.GetType() == base_test_result.ResultType.CRASH:
+          resolved_tombstones = tombstones.ResolveTombstones(
+              device,
+              resolve_all_tombstones=True,
+              include_stack_symbols=False,
+              wipe_tombstones=True)
+          result.SetTombstones(resolved_tombstones)
     return results
 
   #override