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 75 matching lines @@
 Automatically generated using:
 webkit-patch update-flaky-tests
 
 R=%s
 """ % ','.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))
+        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:
             return self._commit_and_upload(tool, options)