Android: upstream latest changes for build/android.

build/android/pylib/test_package.py

 # Copyright (c) 2012 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 re
 import os
 import pexpect
 
@@ skipping 92 matching lines @@
         current = test
         continue
       if 'YOU HAVE' in test:
         break
       test_name = test[2:]
       if not any([test_name.startswith(x) for x in disabled_prefixes]):
         ret += [current + test_name]
     return ret
 
   def PushDataAndPakFiles(self):
+    external_storage = self.adb.GetExternalStorage()
     if (self.test_suite_basename == 'ui_unittests' or
         self.test_suite_basename == 'unit_tests'):
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/chrome.pak',
-          constants.TEST_DATA_DIR + '/paks/chrome.pak')
+          external_storage + '/paks/chrome.pak')
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/locales/en-US.pak',
-          constants.TEST_DATA_DIR + '/paks/en-US.pak')
+          external_storage + '/paks/en-US.pak')
     if self.test_suite_basename == 'unit_tests':
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/resources.pak',
-          constants.TEST_DATA_DIR + '/paks/resources.pak')
+          external_storage + '/paks/resources.pak')
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/chrome_100_percent.pak',
-          constants.TEST_DATA_DIR + '/paks/chrome_100_percent.pak')
+          external_storage + '/paks/chrome_100_percent.pak')
       self.adb.PushIfNeeded(self.test_suite_dirname + '/test_data',
-                            constants.TEST_DATA_DIR + '/test_data')
+                            external_storage + '/test_data')
     if self.test_suite_basename == 'content_unittests':
       self.adb.PushIfNeeded(
           self.test_suite_dirname + '/content_resources.pak',
-          constants.TEST_DATA_DIR + '/paks/content_resources.pak')
+          external_storage + '/paks/content_resources.pak')
 
   def _WatchTestOutput(self, p):
     """Watches the test output.
     Args:
       p: the process generating output as created by pexpect.spawn.
     """
     ok_tests = []
     failed_tests = []
     crashed_tests = []
     timed_out = False
@@ skipping 44 matching lines @@
       if ret_code:
         failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code,
                                         'pexpect.before: %s'
                                         '\npexpect.after: %s'
                                         % (p.before,
                                            p.after))]
     # Create TestResults and return
     return TestResults.FromRun(ok=ok_tests, failed=failed_tests,
                                crashed=crashed_tests, timed_out=timed_out,
                                overall_fail=overall_fail)