Android: fixes option to exclude specific annotated Android instrumentation tests.

build/android/pylib/uiautomator/dispatch.py

 # Copyright (c) 2013 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.
 
 """Dispatches the uiautomator tests."""
 
 import logging
 import os
 
 from pylib import android_commands
@@ skipping 14 matching lines @@
     options: Command line options.
 
   Returns:
     A TestRunResults object holding the results of the Java tests.
 
   Raises:
     Exception: when there are no attached devices.
   """
   test_pkg = test_package.TestPackage(
       options.uiautomator_jar, options.uiautomator_info_jar)
   tests = test_pkg._GetAllMatchingTests(

[bulach, 2013/05/09 11:22:44]

this shouldn't be calling a "_" protected method.
would you mind doing a proper fix please? :) (I'm just sheriffing today..)

-      options.annotations, options.test_filter)
+      options.annotations, options.exclude_annotations, options.test_filter)
   if not tests:
     logging.warning('No uiautomator tests to run with current args.')
     return base_test_result.TestRunResults()
 
   attached_devices = android_commands.GetAttachedDevices()
   if not attached_devices:
     raise Exception('There are no devices online.')
 
   if options.device:
     assert options.device in attached_devices
     attached_devices = [options.device]
 
   def TestRunnerFactory(device, shard_index):
     return test_runner.TestRunner(
         options, device, shard_index, test_pkg, [])
 
   return shard.ShardAndRunTests(TestRunnerFactory, attached_devices, tests,
                                 options.build_type)