Minor cleanups to flakytests.py

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 27 matching lines @@
     name = "update-flaky-tests"
     help_text = "Update FlakyTests file from the flakiness dashboard"
     show_in_main_help = True
 
     ALWAYS_CC = [
         'ojan@chromium.org',
         'dpranke@chromium.org',
         'eseidel@chromium.org',
     ]
 
+    COMMIT_MESSAGE = (
+        'Update FlakyTests to match current flakiness dashboard results\n\n'
+        'Automatically generated using:\n'
+        'webkit-patch update-flaky-tests\n\n'
+        'R=%s\n')
+
+    FLAKY_TEST_CONTENTS = (
+        '# This file is generated by webkit-patch update-flaky-tests from the flakiness dashboard data.\n'
+        '# Manual changes will be overwritten.\n\n'
+        '%s\n')
+
     def __init__(self):
         options = [
             optparse.make_option('--upload', action='store_true',
                 help='upload the changed FlakyTest file for review'),
             optparse.make_option('--reviewers', action='store',
                 help='comma-separated list of reviewers, defaults to blink gardeners'),
         ]
         AbstractDeclarativeCommand.__init__(self, options=options)
         # This is sorta silly, but allows for unit testing:
         self.expectations_factory = BotTestExpectationsFactory
@@ skipping 16 matching lines @@
 
         if options.reviewers:
             # FIXME: Could validate these as emails. sheriff_calendar has some code for that.
             reviewer_emails = options.reviewers.split(',')
         else:
             reviewer_emails = sheriff_calendar.current_gardener_emails()
             if not reviewer_emails:
                 print "No gardener, and --reviewers not specified, not bothering."
                 return 1
 
-        commit_message = """Update FlakyTests to match current flakiness dashboard results
-
-Automatically generated using:
-webkit-patch update-flaky-tests
-
-R=%s
-""" % ','.join(reviewer_emails)
-
+        commit_message = self.COMMIT_MESSAGE % ','.join(reviewer_emails)
         git_cmd = ['git', 'commit', '-m', commit_message,
             tool.filesystem.join(tool.scm().checkout_root, flaky_tests_path)]
         tool.executive.run_and_throw_if_fail(git_cmd)
 
-        # FIXME: There must be a cleaner way to avoid the editor!
-        # Silence the editor.
-        os.environ['EDITOR'] = 'true'
-
-        git_cmd = ['git', 'cl', 'upload', '--send-mail',
+        git_cmd = ['git', 'cl', 'upload', '--send-mail', '-f',
             '--cc', ','.join(self.ALWAYS_CC)]
         tool.executive.run_and_throw_if_fail(git_cmd)
 
     def execute(self, options, args, tool):
         port = tool.port_factory.get()
         port_names = tool.port_factory.all_port_names()
         factory = self.expectations_factory()
         lines = self._collect_expectation_lines(port_names, factory)
         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)
 
         # 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.
         flaky_tests_path = fs.join(port.layout_tests_dir(), 'FlakyTests')
-        fs.write_text_file(flaky_tests_path, TestExpectations.list_to_string(lines))
+        flaky_tests_contents = self.FLAKY_TEST_CONTENTS % TestExpectations.list_to_string(lines)
+        fs.write_text_file(flaky_tests_path, flaky_tests_contents)
         print "Updated %s" % flaky_tests_path
 
         if options.upload:
             return self._commit_and_upload(tool, options)