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

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

 # Copyright 2014 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 itertools
 import os
 import posixpath
 
 from devil.android import device_errors
@@ skipping 222 matching lines @@
   def SetUp(self):
     @local_device_test_run.handle_shard_failures_with(
         on_failure=self._env.BlacklistDevice)
     def individual_device_set_up(dev):
       def install_apk():
         # Install test APK.
         self._delegate.Install(dev)
 
       def push_test_data():
         # Push data dependencies.
-        external_storage = dev.GetExternalStoragePath()
+        device_root = posixpath.join(dev.GetExternalStoragePath(),
+                                     'chromium_tests_root')

[jbudorick, 2016/05/18 14:23:38]

I still don't really like having this hard-coded both here and in UrlUtils.java.
I'm wondering if we can provide this some other way (<meta-data> in the
manifest?) s.t. it's only specified once.

[agrieve, 2016/05/19 02:11:53]

I don't think manifest will work since tests can specify their own manifests.
Command-line flag is also annoying since there are different mechanics for
instrumentation tests / gtests. Perhaps as a bundle extra to the
instrumentation, but I think it's nicer to keep the number of args there low.
Perhaps easiest way would be to just regexp extract the value from the .java
file. However, I think with the name being much more searchable it's fine to
have it in the two spots (it used to be in 3 spots and less searchable, so
marked improvement at least)

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

I disagree, particularly with the regexp extraction part, but I can live with
this for now.

         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)
+        if not host_device_tuples:
+          dev.RunShellCommand(['rm', '-rf', device_root])

[jbudorick, 2016/05/18 14:23:38]

check_return=True here and below

[agrieve, 2016/05/19 02:11:53]

Done.

+          dev.RunShellCommand(['mkdir', '-p', device_root])
 
       def init_tool_and_start_servers():
         tool = self.GetTool(dev)
         tool.CopyFiles(dev)
         tool.SetupEnvironment()
 
         self._servers[str(dev)] = []
         if self.TestPackage() in _SUITE_REQUIRES_TEST_SERVER_SPAWNER:
           self._servers[str(dev)].append(
               local_test_server_spawner.LocalTestServerSpawner(
@@ skipping 97 matching lines @@
   def TearDown(self):
     @local_device_test_run.handle_shard_failures
     def individual_device_tear_down(dev):
       for s in self._servers.get(str(dev), []):
         s.TearDown()
 
       tool = self.GetTool(dev)
       tool.CleanUpEnvironment()
 
     self._env.parallel_devices.pMap(individual_device_tear_down)