👔 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(), 'gtestdata')
         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('r=%s;rm -rf $r;mkdir -p $r' % device_root)

[jbudorick, 2016/04/27 19:59:01]

I'm assuming this is the motivation for gtestdata. I don't think this is worth
it.

[agrieve, 2016/04/27 20:26:31]

The delete_device_stale=True part is the motivation.
This mkdir line here might not be needed, but I was just trying to be cautious.

[jbudorick, 2016/04/27 20:41:36]

I meant the rm -rf portion more than the mkdir portion.

As usual, I don't like chaining multiple commands outside of DeviceUtils, which
has a private interface to handle such shenanigans. (It'd be nice to have a
public one at some point, but I haven't had time or general motivation to create
one that's clean enough to make public.)

[agrieve, 2016/04/29 15:56:35]

Alright, I don't think this will be a case that slows things down any, so
switched it to two calls.

 
       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)