Revert of Rename existing Blink try bots to include OS version.

scripts/slave/recipes/chromium_trybot.py

 # Copyright 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.
 
 import collections
 
 from recipe_engine.types import freeze
 
 DEPS = [
   'depot_tools/bot_update',
@@ skipping 282 matching lines @@
         props(mastername=mastername, buildername=buildername)
       )
 
   yield (
     api.test('chromeos_analyze') +
     api.platform.name('linux') +
     props(mastername='tryserver.chromium.linux',
           buildername='chromeos_amd64-generic_chromium_compile_only_ng')
   )
 
+  # Additional tests for blink trybots.
+  blink_trybots = api.chromium_tests.trybots['tryserver.blink']['builders']
+  for buildername, bot_config in blink_trybots.iteritems():
+    if bot_config.get('analyze_mode') == 'compile':
+      continue
+
+    for pass_first in (True, False):
+      test_name = 'full_%s_%s_%s' % (_sanitize_nonalpha('tryserver.blink'),
+                                     _sanitize_nonalpha(buildername),
+                                     'pass' if pass_first else 'fail')
+      test = (api.test(test_name) +
+              suppress_analyze() +
+              props(mastername='tryserver.blink',
+                    buildername=buildername) +
+              api.chromium_tests.platform(bot_config['bot_ids']) +
+              api.override_step_data('webkit_tests (with patch)',
+                  api.test_utils.canned_test_output(passing=pass_first)))
+      if not pass_first:
+        test += api.override_step_data('webkit_tests (without patch)',
+            api.test_utils.canned_test_output(passing=False, minimal=True))
+      yield test
+
   # Regression test for http://crbug.com/453471#c16
   yield (
     api.test('clobber_analyze') +
     props(buildername='linux_chromium_clobber_rel_ng') +
     api.platform.name('linux') +
     api.override_step_data(
       'analyze',
       api.json.output({
           'status': 'Found dependency',
           'test_targets': [],
@@ skipping 502 matching lines @@
         api.raw_io.stream_output(
             'third_party/WebKit/Source/core/dom/Element.cpp\n')
     )
   )
 
   # This tests that if the first fails, but the second pass succeeds
   # that we fail the whole build.
   yield (
     api.test('blink_minimal_pass_continues') +
     props(mastername='tryserver.blink',
-          buildername='linux_precise_blink_rel') +
+          buildername='linux_blink_rel') +
     suppress_analyze() +
     api.platform.name('linux') +
     api.override_step_data('webkit_tests (with patch)',
         api.test_utils.canned_test_output(passing=False)) +
     api.override_step_data('webkit_tests (without patch)',
         api.test_utils.canned_test_output(passing=True, minimal=True))
   )
 
   yield (
     api.test('blink_compile_without_patch_fails') +
     props(mastername='tryserver.blink',
-          buildername='linux_precise_blink_rel') +
+          buildername='linux_blink_rel') +
     suppress_analyze() +
     api.platform.name('linux') +
     api.override_step_data('webkit_tests (with patch)',
         api.test_utils.canned_test_output(passing=False)) +
     api.override_step_data('compile (without patch)', retcode=1)
   )
 
   # This tests what happens if something goes horribly wrong in
   # run-webkit-tests and we return an internal error; the step should
   # be considered a hard failure and we shouldn't try to compare the
   # lists of failing tests.
   # 255 == test_run_results.UNEXPECTED_ERROR_EXIT_STATUS in run-webkit-tests.
   yield (
     api.test('webkit_tests_unexpected_error') +
     props(mastername='tryserver.blink',
-          buildername='linux_precise_blink_rel') +
+          buildername='linux_blink_rel') +
     suppress_analyze() +
     api.platform.name('linux') +
     api.override_step_data('webkit_tests (with patch)',
         api.test_utils.canned_test_output(passing=False, retcode=255))
   )
 
   # TODO(dpranke): crbug.com/357866 . This tests what happens if we exceed the
   # number of failures specified with --exit-after-n-crashes-or-times or
   # --exit-after-n-failures; the step should be considered a hard failure and
   # we shouldn't try to compare the lists of failing tests.
   # 130 == test_run_results.INTERRUPTED_EXIT_STATUS in run-webkit-tests.
   yield (
     api.test('webkit_tests_interrupted') +
     props(mastername='tryserver.blink',
-          buildername='linux_precise_blink_rel') +
+          buildername='linux_blink_rel') +
     suppress_analyze() +
     api.platform.name('linux') +
     api.override_step_data('webkit_tests (with patch)',
         api.test_utils.canned_test_output(passing=False, retcode=130))
   )
 
   # This tests what happens if we don't trip the thresholds listed
   # above, but fail more tests than we can safely fit in a return code.
   # (this should be a soft failure and we can still retry w/o the patch
   # and compare the lists of failing tests).
   yield (
     api.test('too_many_failures_for_retcode') +
     props(mastername='tryserver.blink',
-          buildername='linux_precise_blink_rel') +
+          buildername='linux_blink_rel') +
     suppress_analyze() +
     api.platform.name('linux') +
     api.override_step_data('webkit_tests (with patch)',
         api.test_utils.canned_test_output(passing=False,
                                           num_additional_failures=125)) +
     api.override_step_data('webkit_tests (without patch)',
         api.test_utils.canned_test_output(passing=True, minimal=True))
   )
 
   yield (
-    api.test('webkit_tests_with_and_without_patch_fail') +
-    suppress_analyze() +
-    props(mastername='tryserver.blink',
-          buildername='linux_precise_blink_rel') +
-    api.override_step_data('webkit_tests (with patch)',
-        api.test_utils.canned_test_output(passing=False)) +
-    api.override_step_data('webkit_tests (without patch)',
-        api.test_utils.canned_test_output(passing=False, minimal=True))
-  )
-
-  yield (
     api.test('non_cq_blink_tryjob') +
     props(mastername='tryserver.blink',
-          buildername='win7_blink_rel',
+          buildername='win_blink_rel',
           requester='someone@chromium.org') +
     suppress_analyze() +
     api.platform.name('win') +
     api.override_step_data('webkit_tests (with patch)',
                            api.test_utils.canned_test_output(passing=True))
   )
 
   yield (
     api.test('use_skia_patch_on_blink_trybot') +
     props(mastername='tryserver.blink',
-          buildername='mac10.9_blink_rel',
+          buildername='mac_blink_rel',
           patch_project='skia') +
     api.platform.name('mac')
   )
 
   yield (
     api.test('use_v8_patch_on_blink_trybot') +
     props(mastername='tryserver.blink',
-          buildername='mac10.9_blink_rel',
+          buildername='mac_blink_rel',
           patch_project='v8') +
     api.platform.name('mac')
   )
 
   yield (
     api.test('use_v8_patch_on_blink_trybot_test_failures') +
     props(mastername='tryserver.v8',
           buildername='v8_linux_blink_rel',
           patch_project='v8') +
     api.platform.name('linux') +
     suppress_analyze(more_exclusions=['v8/f.*']) +
     api.override_step_data('webkit_tests (with patch)',
         api.test_utils.canned_test_output(passing=False)) +
     api.override_step_data('webkit_tests (without patch)',
         api.test_utils.canned_test_output(passing=True, minimal=True))
   )