Revert of 👔 Reland of Move side-loaded test data /sdcard -> /sdcard/gtestdata

build/android/pylib/local/device/local_device_instrumentation_test_run.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 logging
 import os
-import posixpath
 import re
 import time
 
 from devil.android import device_errors
 from devil.android import flag_changer
 from devil.utils import reraiser_thread
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.local.device import local_device_test_run
 
@@ skipping 34 matching lines @@
 class LocalDeviceInstrumentationTestRun(
     local_device_test_run.LocalDeviceTestRun):
   def __init__(self, env, test_instance):
     super(LocalDeviceInstrumentationTestRun, self).__init__(env, test_instance)
     self._flag_changers = {}
 
   def TestPackage(self):
     return self._test_instance.suite
 
   def SetUp(self):
-    def substitute_device_root(d, device_root):
+    def substitute_external_storage(d, external_storage):
       if not d:
-        return device_root
+        return external_storage
       elif isinstance(d, list):
-        return posixpath.join(p if p else device_root for p in d)
+        return '/'.join(p if p else external_storage for p in d)
       else:
         return d
 
     @local_device_test_run.handle_shard_failures_with(
         self._env.BlacklistDevice)
     def individual_device_set_up(dev, host_device_tuples):
       def install_apk():
         if self._test_instance.apk_under_test:
           if self._test_instance.apk_under_test_incremental_install_script:
             local_device_test_run.IncrementalInstall(
@@ skipping 23 matching lines @@
           if not self._test_instance.package_info:
             logging.error("Couldn't set debug app: no package info")
           elif not self._test_instance.package_info.package:
             logging.error("Couldn't set debug app: no package defined")
           else:
             dev.RunShellCommand(['am', 'set-debug-app', '--persistent',
                                   self._test_instance.package_info.package],
                                 check_return=True)
 
       def push_test_data():
-        device_root = posixpath.join(dev.GetExternalStoragePath(),
-                                     'chromium_tests_root')
+        external_storage = dev.GetExternalStoragePath()
         host_device_tuples_substituted = [
-            (h, substitute_device_root(d, device_root))
+            (h, substitute_external_storage(d, external_storage))
             for h, d in host_device_tuples]
         logging.info('instrumentation data deps:')
         for h, d in host_device_tuples_substituted:
           logging.info('%r -> %r', h, d)
-        dev.PushChangedFiles(host_device_tuples_substituted,
-                             delete_device_stale=True)
-        if not host_device_tuples_substituted:
-          dev.RunShellCommand(['rm', '-rf', device_root], check_return=True)
-          dev.RunShellCommand(['mkdir', '-p', device_root], check_return=True)
+        dev.PushChangedFiles(host_device_tuples_substituted)
 
       def create_flag_changer():
         if self._test_instance.flags:
           if not self._test_instance.package_info:
             logging.error("Couldn't set flags: no package info")
           elif not self._test_instance.package_info.cmdline_file:
             logging.error("Couldn't set flags: no cmdline_file")
           else:
             self._CreateFlagChangerIfNeeded(dev)
             logging.debug('Attempting to set flags: %r',
@@ skipping 198 matching lines @@
         timeout = v
         break
     else:
       logging.warning('Using default 1 minute timeout for %s', test_name)
       timeout = 60
 
     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
 
     return timeout