[Release] Automatically notify mailing list on a pending merge

tools/release/test_scripts.py

 #!/usr/bin/env python
 # Copyright 2013 the V8 project authors. 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
@@ skipping 371 matching lines @@
     with open(version_file, "w") as f:
       f.write("  // Some line...\n")
       f.write("\n")
       f.write("#define V8_MAJOR_VERSION    %s\n" % major)
       f.write("#define V8_MINOR_VERSION    %s\n" % minor)
       f.write("#define V8_BUILD_NUMBER     %s\n" % build)
       f.write("#define V8_PATCH_LEVEL      %s\n" % patch)
       f.write("  // Some line...\n")
       f.write("#define V8_IS_CANDIDATE_VERSION 0\n")
 
+  def WriteFakeWatchlistsFile(self):
+    watchlists_file = os.path.join(TEST_CONFIG["DEFAULT_CWD"], WATCHLISTS_FILE)
+    if not os.path.exists(os.path.dirname(watchlists_file)):
+      os.makedirs(os.path.dirname(watchlists_file))
+    with open(watchlists_file, "w") as f:
+      f.write("  // Some line...\n")
+      f.write("\n")
+      f.write("'merges': [")
+      f.write("# Only enabled on branches created with tools/release/create_release.py")
+      f.write("# 'v8-merges@googlegroups.com',")

[Michael Achenbach, 2016/02/04 08:19:41]

Please add the same whitespace as in the original file and make sure the regexps
still apply. You'd also need '\n' in the end of each line. Generally I find
multi-line strings in python more readable with """-strings (optionally with
local var):

  f.write("""
  'merges': [
    # Only enabled on branches created with tools/release/create_release.py
    # 'v8-merges@googlegroups.com',
  ],""")

[Michael Hablich, 2016/02/04 09:01:22]

Ack and done. Just copied the style in the method above.

+      f.write("],")
+
   def MakeStep(self):
     """Convenience wrapper."""
     options = ScriptsBase(TEST_CONFIG, self, self._state).MakeOptions([])
     return MakeStep(step_class=Step, state=self._state,
                     config=TEST_CONFIG, side_effect_handler=self,
                     options=options)
 
   def RunStep(self, script=PushToCandidates, step_class=Step, args=None):
     """Convenience wrapper."""
     args = args if args is not None else ["-m"]
@@ skipping 500 matching lines @@
 
     def CheckVersionCommit():
       commit = FileToText(TEST_CONFIG["COMMITMSG_FILE"])
       self.assertEquals(commit_msg, commit)
       version = FileToText(
           os.path.join(TEST_CONFIG["DEFAULT_CWD"], VERSION_FILE))
       self.assertTrue(re.search(r"#define V8_MINOR_VERSION\s+22", version))
       self.assertTrue(re.search(r"#define V8_BUILD_NUMBER\s+5", version))
       self.assertFalse(re.search(r"#define V8_BUILD_NUMBER\s+6", version))
       self.assertTrue(re.search(r"#define V8_PATCH_LEVEL\s+0", version))
       self.assertTrue(

[Michael Achenbach, 2016/02/04 08:19:41]

optional: You could add an assert here to check that your file has the right
content on commit. And rename the method to something more general, i.e. just
CheckCommit.

[Michael Hablich, 2016/02/04 09:01:22]

Done. Added it to the bottom after all the work was done. Makes more sense.

[Michael Achenbach, 2016/02/04 09:28:45]

Makes only sense because the tests are incorrect (insufficient). They don't mock
the side effects of the "git checkout master" command properly. Otherwise there
would be no changes left in the end. But anyways, these tests are messy...
there's a similar comment at the asserts that I added. Which are also wrong...

           re.search(r"#define V8_IS_CANDIDATE_VERSION\s+0", version))
 
       # Check that the change log on the candidates branch got correctly
       # modified.
       change_log = FileToText(
           os.path.join(TEST_CONFIG["DEFAULT_CWD"], CHANGELOG_FILE))
       self.assertEquals(
 """1999-07-31: Version 3.22.5
 
         Log text 1 (issue 321).
@@ skipping 22 matching lines @@
       Cmd("git log -1 --format=%H release_hash^", "abc3\n"),
       Cmd("git log --format=%H abc3..push_hash", "rev1\n"),
       Cmd("git log -1 --format=%s rev1", "Log text 1.\n"),
       Cmd("git log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"),
       Cmd("git log -1 --format=%an rev1", "author1@chromium.org\n"),
       Cmd("git reset --hard origin/master", ""),
       Cmd("git checkout -b work-branch push_hash", ""),
       Cmd("git checkout -f 3.22.4 -- ChangeLog", "", cb=ResetChangeLog),
       Cmd("git checkout -f 3.22.4 -- include/v8-version.h", "",
           cb=self.WriteFakeVersionFile),
+      Cmd("git checkout -f 3.22.4 -- WATCHLISTS", "",
+          cb=self.WriteFakeWatchlistsFile),
       Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
           cb=CheckVersionCommit),
       Cmd("git push origin "
           "refs/heads/work-branch:refs/pending/heads/3.22.5 "
           "push_hash:refs/pending-tags/heads/3.22.5 "
           "push_hash:refs/heads/3.22.5", ""),
       Cmd("git fetch", ""),
       Cmd("git log -1 --format=%H --grep="
           "\"Version 3.22.5\" origin/3.22.5", "hsh_to_tag"),
       Cmd("git tag 3.22.5 hsh_to_tag", ""),
@@ skipping 578 matching lines @@
 
 Review URL: https://codereview.chromium.org/83173002
 
 ------------------------------------------------------------------------""")
     self.assertEquals(
 """Prepare push to trunk.  Now working on version 3.23.11.
 
 R=danno@chromium.org
 
 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)