Change test running logic to run tests without any size annotation.

build/android/pylib/run_java_tests.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.
 
 """Runs the Java tests. See more information on run_instrumentation_tests.py."""
 
 import fnmatch
 import logging
 import os
 import re
@@ skipping 511 matching lines @@
     options: Command line options.
     apks: list of APKs to use.
 
   Returns:
     A TestResults object holding the results of the Java tests.
 
   Raises:
     FatalTestException: when there's no attached the devices.
   """
   test_apk = apks[0]
+  test_size_annotations = frozenset(['Smoke', 'SmallTest', 'MediumTest',
+                                     'LargeTest', 'EnormousTest', 'FlakyTest',
+                                     'DisabledTest', 'Manual', 'PerfTest'])
+  # The default annotation for tests which do not have any sizes annotation.
+  default_size_annotation = 'FlakyTest'

[Yaron, 2012/12/05 21:52:50]

I think I prefer unspecified to not be Flaky. In general, we should not have
flaky tests and shouldn't plan for them.

[frankf, 2012/12/05 22:12:25]

Agree with Yaron. If someone adds a test and forgets to annotate it, then it
will get lost in the "miscellaneous bucket" we call flaky tests until the next
fixit.

[shashi, 2012/12/05 23:30:06]

I have it as FlakyTest so that the bots do not break if a new test without
annotation is added.I have changed it back to SmallTest.

   if options.annotation:
     available_tests = test_apk.GetAnnotatedTests(options.annotation)
-    if len(options.annotation) == 1 and options.annotation[0] == 'SmallTest':
-      tests_without_annotation = [
+    if (len(options.annotation) == 1 and
+        options.annotation[0] == default_size_annotation):
+      tests_without_size_annotation = [
           m for m in
           test_apk.GetTestMethods()
-          if not test_apk.GetTestAnnotations(m) and
+          if frozenset(test_apk.GetTestAnnotations(m)).

[Yaron, 2012/12/05 21:52:50]

this is now too complicated for a list comprehension. Please extract a helper
function

[shashi, 2012/12/05 23:30:06]

Done.

+          isdisjoint(test_size_annotations) and
           not apk_info.ApkInfo.IsPythonDrivenTest(m)]
-      if tests_without_annotation:
-        tests_without_annotation.sort()
+      if tests_without_size_annotation:
+        tests_without_size_annotation.sort()
         logging.warning('The following tests do not contain any annotation. '
-                        'Assuming "SmallTest":\n%s',
-                        '\n'.join(tests_without_annotation))
-        available_tests += tests_without_annotation
+                        'Assuming "%s":\n%s',
+                        default_size_annotation,
+                        '\n'.join(tests_without_size_annotation))
+        available_tests += tests_without_size_annotation
   else:
     available_tests = [m for m in test_apk.GetTestMethods()
                        if not apk_info.ApkInfo.IsPythonDrivenTest(m)]
   coverage = os.environ.get('EMMA_INSTRUMENT') == 'true'
 
   tests = []
   if options.test_filter:
     # |available_tests| are in adb instrument format: package.path.class#test.
     filter_without_hash = options.test_filter.replace('#', '.')
     tests = [t for t in available_tests
@@ skipping 17 matching lines @@
 
   logging.info('Will run: %s', str(tests))
 
   if len(attached_devices) > 1 and (coverage or options.wait_for_debugger):
     logging.warning('Coverage / debugger can not be sharded, '
                     'using first available device')
     attached_devices = attached_devices[:1]
   sharder = TestSharder(attached_devices, options, tests, apks)
   test_results = sharder.RunShardedTests()
   return test_results