Minor cleanups to flakytests.py

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

Index: Tools/Scripts/webkitpy/tool/commands/flakytests.py
diff --git a/Tools/Scripts/webkitpy/tool/commands/flakytests.py b/Tools/Scripts/webkitpy/tool/commands/flakytests.py
index 69f0390f5573350db5e1c68498b69418fe5d8d43..8bc5c1baae9b99525dd43f963949a441178d7188 100644
--- a/Tools/Scripts/webkitpy/tool/commands/flakytests.py
+++ b/Tools/Scripts/webkitpy/tool/commands/flakytests.py
@@ -93,11 +93,7 @@ R=%s
             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)
 
@@ -115,7 +111,11 @@ R=%s
         # 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))
+        fs.write_text_file(flaky_tests_path, """# This file is generated by webkit-patch update-flaky-tests from the flakiness dashboard data.

[Dirk Pranke, 2014/06/09 17:07:10]

Nit: I think you can do 

fs.write_text_file(flaky_tests_path(, """\
# This file is generated ...
""")

to make things a little easier to read.

Though, in this case, I might just use indented strings that are
auto-concatenated, e.g.:

fs.write_text_file(flaky_tests_path,
                          "# this file is generated ...\n"
                          "# Manual changes will be overwritten.\n"
                          "\n"
                          "%s" % ...)

to preserve the indentation.

+# Manual changes will be overwritten.
+
+%s
+""" % TestExpectations.list_to_string(lines))
         print "Updated %s" % flaky_tests_path
 
         if options.upload: