Convert to gtest-style filtering in instrumentation tests.

Convert to gtest-style filtering in instrumentation tests.

BUG=280354
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=252687

[jbudorick, 2014-01-22 00:43:07]

The instrumentation & host-driven tests had been doing test filtering using only
substrings, so wildcards didn't work. Switched to using regex searching, though
it might be better to use globs instead.

[frankf, 2014-01-22 18:43:11]

I think it's more consistent and intuitive to use gtest-style filter strings
(Take a look at gtest/setup.py). The only caveat is that we can't use fully
qualified package names:

A.B.FooTest#testBar -> FooTest.testBar

https://codereview.chromium.org/144183004/diff/1/build/android/pylib/instrume...
File build/android/pylib/instrumentation/test_jar.py (right):

https://codereview.chromium.org/144183004/diff/1/build/android/pylib/instrume...
build/android/pylib/instrumentation/test_jar.py:212: if
re.search(filter_without_hash, t.replace('#', '.'))]
The test filter includes '.' in package names which are consumed by re right?

[jbudorick, 2014-01-22 21:45:32]

switched to using gtest's filtering logic.

[frankf, 2014-01-22 22:14:11]

could you also enumerate the test cases you used?

https://codereview.chromium.org/144183004/diff/50001/build/android/pylib/inst...
File build/android/pylib/instrumentation/test_jar.py (right):

https://codereview.chromium.org/144183004/diff/50001/build/android/pylib/inst...
build/android/pylib/instrumentation/test_jar.py:219:
t.split('.')[-1].replace('#', '.') : t for t in available_tests}
dictionary comprehension is only python 2.7+ right?

https://codereview.chromium.org/144183004/diff/50001/build/android/pylib/inst...
build/android/pylib/instrumentation/test_jar.py:225: test_filter.replace('#',
'.'))]
this is pretty unreadable, can you tweak the white space?

[jbudorick, 2014-01-22 23:40:52]

tested against the following:
 SearchByImageTest.testSearchByImageTest
 SyncTest.*
 RestoreTest.*
 RestoreTest.*:-RestoreTest.testCrashRestore
 *:-SyncTest.*
 SearchByImageTest.testSearchByImageTest:RestoreTest.testCrashRestore
 SearchByImageTest.*:Upgrade*

[frankf, 2014-01-22 23:46:12]

lgtm. Please run Android trybots and update the doc

[jbudorick, 2014-02-12 00:58:01]

The CQ bit was checked by jbudorick@chromium.org

[commit-bot: I haz the power, 2014-02-12 01:01:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jbudorick@chromium.org/144183004/220001

[commit-bot: I haz the power, 2014-02-12 07:05:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-12 07:05:58]

Retried try job too often on win_rel for step(s) ash_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[jbudorick, 2014-02-21 18:40:40]

The CQ bit was checked by jbudorick@chromium.org

[commit-bot: I haz the power, 2014-02-21 18:40:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jbudorick@chromium.org/144183004/220001

[commit-bot: I haz the power, 2014-02-21 18:40:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-21 18:40:53]

Failed to apply patch for
build/android/pylib/host_driven/test_info_collection.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/android/pylib/host_driven/test_info_collection.py
  Hunk #1 FAILED at 6.
  Hunk #2 succeeded at 98 with fuzz 1 (offset 1 line).
  Hunk #3 FAILED at 132.
  2 out of 3 hunks FAILED -- saving rejects to file
build/android/pylib/host_driven/test_info_collection.py.rej

Patch:       build/android/pylib/host_driven/test_info_collection.py
Index: build/android/pylib/host_driven/test_info_collection.py
diff --git a/build/android/pylib/host_driven/test_info_collection.py
b/build/android/pylib/host_driven/test_info_collection.py
index
a857d3c1cdf2e63b92c3f62cda2d860f85517732..8a6fbd36113eadcdf53ed4f71e46190e83bb037b
100644
--- a/build/android/pylib/host_driven/test_info_collection.py
+++ b/build/android/pylib/host_driven/test_info_collection.py
@@ -6,9 +6,17 @@
 
 import logging
 import os
+import sys
 
 import tests_annotations
 
+from pylib import constants
+
+sys.path.insert(0,
+                os.path.join(constants.DIR_SOURCE_ROOT,
+                             'build', 'util', 'lib', 'common'))
+
+import unittest_util
 
 class TestInfo(object):
   """An object containing and representing a test function, plus metadata."""
@@ -97,9 +105,13 @@ class TestInfoCollection(object):
       excluded_tests = [t for t in available_tests if
                         self._AnnotationIncludesTest(t, exclude_annotations)]
       available_tests = list(set(available_tests) - set(excluded_tests))
-    available_tests = [t for t in available_tests if
-                       self._NameFilterIncludesTest(t, name_filter)]
 
+    if name_filter:
+      available_test_names = unittest_util.FilterTestNames(
+          [t.qualified_name for t in available_tests], name_filter)
+      available_tests = [
+          t for t in available_tests if
+          t.qualified_name in available_test_names]
     return available_tests
 
   def _AnnotationIncludesTest(self, test_info, annotation_filter_list):
@@ -128,17 +140,3 @@ class TestInfoCollection(object):
         return True
     return False
 
-  def _NameFilterIncludesTest(self, test_info, name_filter):
-    """Checks whether a name filter matches a given test_info's method name.
-
-    This is a case-sensitive, substring comparison: 'Foo' will match methods
-    Foo.testBar and Bar.testFoo. 'foo' would not match either.
-
-    Args:
-      test_info: TestInfo object representing the test
-      name_filter: substring to check for in the qualified name of the test
-
-    Returns:
-      True if no name filter supplied or it matches; False otherwise.
-    """
-    return not name_filter or name_filter in test_info.qualified_name

[jbudorick, 2014-02-21 18:52:55]

The CQ bit was checked by jbudorick@chromium.org

[commit-bot: I haz the power, 2014-02-21 18:53:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jbudorick@chromium.org/144183004/820001

[commit-bot: I haz the power, 2014-02-21 19:15:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jbudorick@chromium.org/144183004/820001

[commit-bot: I haz the power, 2014-02-21 23:35:12]

Change committed as 252687