Fix test data push for APK tests.

build/android/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 19 matching lines @@
     tool: Name of the Valgrind tool.
     dump_debug_info: A debug_info object.
   """
 
   def __init__(self, adb, device, test_suite, timeout, rebaseline,
                performance_test, cleanup_test_files, tool, dump_debug_info):
     self.adb = adb
     self.device = device
     self.test_suite_full = test_suite
     self.test_suite = os.path.splitext(test_suite)[0]
-    self.test_suite_basename = os.path.basename(self.test_suite)
+    self.test_suite_basename = self._GetTestSuiteBaseName()

[John Grabowski, 2012/05/17 17:20:06]

@property
def test_suite_basename(self):
  return self._GetTestSuiteBaseName()

[nilesh, 2012/05/17 18:43:24]

I am new to python, so my understanding may be wrong.
But wouldn't using property will lead to _GetTestSuiteBaseName() being called
everytime test_suite_basename is being referenced. test_suite_basename is a
computed value but it needs to be computed only once.

     self.test_suite_dirname = os.path.dirname(self.test_suite)
     self.rebaseline = rebaseline
     self.performance_test = performance_test
     self.cleanup_test_files = cleanup_test_files
     self.tool = CreateTool(tool, self.adb)
     if timeout == 0:
       if self.test_suite_basename == 'page_cycler_tests':
         timeout = 900
       else:
         timeout = 60
@@ skipping 133 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)