👔 Move side-loaded test data /sdcard -> /sdcard/gtestdata

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

Index: build/android/pylib/local/device/local_device_gtest_run.py
diff --git a/build/android/pylib/local/device/local_device_gtest_run.py b/build/android/pylib/local/device/local_device_gtest_run.py
index 2630af9e37a04cb25fd692ac3e8b8b455c9847f3..9486d88a0b7c6d414a7afe0441f2bc38fbbbd467 100644
--- a/build/android/pylib/local/device/local_device_gtest_run.py
+++ b/build/android/pylib/local/device/local_device_gtest_run.py
@@ -241,12 +241,16 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
 
       def push_test_data():
         # Push data dependencies.
-        external_storage = dev.GetExternalStoragePath()
+        device_root = posixpath.join(dev.GetExternalStoragePath(),
+                                     'chromium_tests_root')
         data_deps = self._test_instance.GetDataDependencies()
         host_device_tuples = [
-            (h, d if d is not None else external_storage)
+            (h, d if d is not None else device_root)
             for h, d in data_deps]
-        dev.PushChangedFiles(host_device_tuples)
+        dev.PushChangedFiles(host_device_tuples, delete_device_stale=True)

[jbudorick, 2016/05/24 19:13:52]

Beware that this is liable to make test execution time on the bots slightly
longer in the short term. (Once everything is on swarming, it won't matter.)

+        if not host_device_tuples:
+          dev.RunShellCommand(['rm', '-rf', device_root], check_return=True)
+          dev.RunShellCommand(['mkdir', '-p', device_root], check_return=True)
 
       def init_tool_and_start_servers():
         tool = self.GetTool(dev)