Make update-flaky-tests to work again and support all bots

Tools/Scripts/webkitpy/tool/commands/flakytests.py

 # Copyright (c) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 12 matching lines @@
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import optparse
 from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
 from webkitpy.layout_tests.layout_package.bot_test_expectations import BotTestExpectationsFactory
 from webkitpy.layout_tests.models.test_expectations import TestExpectationParser, TestExpectationsModel, TestExpectations
+from webkitpy.common.net import sheriff_calendar
 
 
 class FlakyTests(AbstractDeclarativeCommand):
     name = "update-flaky-tests"
     help_text = "Update FlakyTests file from the flakiness dashboard"
     show_in_main_help = True
 
     def __init__(self):
         options = [
             optparse.make_option('--upload', action='store_true',
@@ skipping 13 matching lines @@
         lines.sort(key=lambda line: line.path)
         # Skip any tests which are mentioned in the dashboard but not in our checkout:
         fs = tool.filesystem
         lines = filter(lambda line: fs.exists(fs.join(port.layout_tests_dir(), line.path)), lines)
         flaky_tests_path = fs.join(port.layout_tests_dir(), 'FlakyTests')
         # Note: This includes all flaky tests from the dashboard, even ones mentioned
         # in existing TestExpectations. We could certainly load existing TestExpecations
         # and filter accordingly, or update existing TestExpectations instead of FlakyTests.
         with open(flaky_tests_path, 'w') as flake_file:
             flake_file.write(TestExpectations.list_to_string(lines))
+        print "Updated %s" % flaky_tests_path
 
         if not options.upload:
             return 0
 
         files = tool.scm().changed_files()
         flaky_tests_path = 'LayoutTests/FlakyTests'
         if flaky_tests_path not in files:
             print "%s is not changed, not uploading." % flaky_tests_path
             return 0
 
-        commit_message = "Update FlakyTests"
-        git_cmd = ['git', 'commit', '-m', commit_message, flaky_tests_path]
-        tool.executive.run_command(git_cmd)
+        sheriff_emails = sheriff_calendar.current_gardener_emails()
+        if not sheriff_emails:
+            print "No gardener, not bothering."
+            sheriff_emails = ['eseidel@chromium.org']
+            #return 1
 
-        git_cmd = ['git', 'cl', 'upload', '--use-commit-queue', '--send-mail']
-        tool.executive.run_command(git_cmd)
+        commit_message = """Update FlakyTests to match current flakiness dashboard results
+
+Automatically generated using:
+webkit-patch update-flaky-tests
+
+R=%s
+""" % ','.join(sheriff_emails)
+
+        git_cmd = ['git', 'commit', '-m', commit_message,
+            fs.join(tool.scm().checkout_root, flaky_tests_path)]
+        tool.executive.run_and_throw_if_fail(git_cmd)
+
+        git_cmd = ['git', 'cl', 'upload', '--send-mail']
+        tool.executive.run_and_throw_if_fail(git_cmd)
         # If there are changes to git, upload.