Fix test filter filename for APK based tests.

build/android/single_test_runner.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 os
 import sys
 
 from base_test_runner import BaseTestRunner
 import debug_info
@@ skipping 30 matching lines @@
     self._test_arguments = test_arguments
     self.test_results = TestResults()
     if dump_debug_info:
       self.dump_debug_info = debug_info.GTestDebugInfo(self.adb, device,
            os.path.basename(test_suite), gtest_filter)
     else:
       self.dump_debug_info = None
     self.fast_and_loose = fast_and_loose
 
     if os.path.splitext(test_suite)[1] == '.apk':
+      self._apk_test_suite = True;

[Yaron, 2012/05/16 21:23:55]

This violates the point of having TestPackage and sub-classing with
TestPackageApk  and TestPackageExecutable. You should just add a helper function
and implement for TestPackageAPk

[John Grabowski, 2012/05/16 22:24:17]

agree.  E.g. use FilterName() as an overridable method.

[nilesh, 2012/05/16 22:36:54]

Done.

       self.test_package = TestPackageApk(
           self.adb, device,
           test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
           tool, self.dump_debug_info)
     else:
+      self._apk_test_suite = False;
       self.test_package = TestPackageExecutable(
           self.adb, device,
           test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
           tool, self.dump_debug_info)
 
   def _GetHttpServerDocumentRootForTestSuite(self):
     """Returns the document root needed by the test suite."""
     if self.test_package.test_suite_basename == 'page_cycler_tests':
       return os.path.join(run_tests_helper.CHROME_DIR, 'data', 'page_cycler')
     return None
 
 
   def _TestSuiteRequiresMockTestServer(self):
     """Returns True if the test suite requires mock test server."""
     return False
   # TODO(yfriedman): Disabled because of flakiness.
   # (self.test_package.test_suite_basename == 'unit_tests' or
   #          self.test_package.test_suite_basename == 'net_unittests' or
   #          False)
 
   def _GetFilterFileName(self):
     """Returns the filename of gtest filter."""
     filter_dir = os.path.join(sys.path[0], 'gtest_filter')
     filter_name = self.test_package.test_suite_basename + '_disabled'
+    if self._apk_test_suite:

[John Grabowski, 2012/05/16 22:24:17]

Staging/transition makes for odd choices.
In the future, we'll only use the apk.
For now, we have both.

One option is to use the non-apk version as a "default", then have +test and
-test addition/subtraction.  That'll help keep things clean.  But may not be
worth your time.

+      # APK test suite names end with '-debug.apk'
+      filter_name = self.test_package.test_suite_basename.rsplit(
+          '-debug', 1)[0] + '_disabled'
     disabled_filter = os.path.join(filter_dir, filter_name)
     return disabled_filter
 
   def _GetAdditionalEmulatorFilterName(self):
     """Returns the filename of additional gtest filter for emulator."""
     filter_dir = os.path.join(sys.path[0], 'gtest_filter')
     filter_name = '%s%s' % (self.test_package.test_suite_basename,
         '_emulator_additional_disabled')
     disabled_filter = os.path.join(filter_dir, filter_name)
     return disabled_filter
@@ skipping 218 matching lines @@
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.test_package.tool.CleanUpEnvironment()
     if self.test_package.cleanup_test_files:
       self.adb.RemovePushedFiles()
     if self.dump_debug_info:
       self.dump_debug_info.StopRecordingLog()
     if self.test_package.performance_test:
       self.adb.TearDownPerformanceTest()
     super(SingleTestRunner, self).TearDown()