[Findit] Fix 'Trigger same task twice' error.

scripts/slave/recipes/findit/chromium/test.py

 # Copyright 2015 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.
 
 from collections import defaultdict
 import json
 
 from recipe_engine.config import Dict
 from recipe_engine.config import List
 from recipe_engine.config import Single
@@ skipping 56 matching lines @@
 }
 
 
 class TestResult(object):
   SKIPPED = 'skipped'  # A commit doesn't impact the test.
   PASSED = 'passed'  # The compile or test passed.
   FAILED = 'failed'  # The compile or test failed.
   INFRA_FAILED = 'infra_failed'  # Infra failed.
 
 
+def _check_and_remove_test_name(test_names, test_name):
+  """Check if a test_name is in the list and remove it if it is."""
+  try:
+    test_names.remove(test_name)
+    return True
+  except ValueError:
+    return False
+
+
 def _compile_and_test_at_revision(api, target_mastername, target_buildername,
                                   target_testername, revision, requested_tests,
                                   use_analyze):
   results = {}
+
   with api.step.nest('test %s' % str(revision)):
     # Checkout code at the given revision to recompile.
     bot_config = api.chromium_tests.create_bot_config_object(
         target_mastername, target_buildername)
     bot_update_step, bot_db = api.chromium_tests.prepare_checkout(
         bot_config, root_solution_revision=revision)
 
     # Figure out which test steps to run.
     _, all_tests = api.chromium_tests.get_tests(bot_config, bot_db)
+    requested_test_names = [k for k in requested_tests]
     requested_tests_to_run = [
-        test for test in all_tests if test.name in requested_tests]
+        test for test in all_tests if
+        _check_and_remove_test_name(requested_test_names, test.name)]

[stgao, 2016/06/14 23:40:06]

This fix might cause issue.
Each test will has some corresponding settings in the test spec.

As we just select the first one in the list, it might not be for the
target_tester when a builder has 2+ attached testers.

It seems bot_id support both 'buildername' and 'tester' in
https://chromium.googlesource.com/chromium/tools/build/+blame/402d0b5f021aaa0...

We'd better use the target_testername to make sure the correct test is selected.
You may want to talk to phajdan.jr@chromium.org on this.

 
     # Figure out the test targets to be compiled.
     requested_test_targets = []
     for test in requested_tests_to_run:
       requested_test_targets.extend(test.compile_targets(api))
     requested_test_targets = sorted(set(requested_test_targets))
 
     actual_tests_to_run = requested_tests_to_run
     actual_compile_targets = requested_test_targets
     # Use dependency "analyze" to reduce tests to be run.
@@ skipping 31 matching lines @@
           bot_db,
           actual_compile_targets,
           tests_including_triggered=actual_tests_to_run,
           mb_mastername=target_mastername,
           mb_buildername=target_buildername,
           override_bot_type='builder_tester')
 
     # Run the tests.
     with api.chromium_tests.wrap_chromium_tests(
         bot_config, actual_tests_to_run):
+      test_names = [te.name for te in actual_tests_to_run]
       failed_tests = api.test_utils.run_tests(
           api, actual_tests_to_run,
           suffix=revision, test_filters=requested_tests)
 
     # Process failed tests.
     failed_tests_dict = defaultdict(list)
     for failed_test in failed_tests:
       valid = failed_test.has_valid_results(api, suffix=revision)
       results[failed_test.name] = {
           'status': TestResult.FAILED,
@@ skipping 939 matching lines @@
           'git commits in range',
           api.raw_io.stream_output(
               '\n'.join('r%d' % i for i in reversed(range(1, 7))))) +
       api.override_step_data(
           'test r2.gl_tests (r2) on Mac-10.9',
           simulated_gtest_output(passed_test_names=['Test.One'])) +
       api.override_step_data(
           'test r3.gl_tests (r3) on Mac-10.9',
           simulated_gtest_output(failed_test_names=['Test.One']))
   )