Revert of Version 4.9.385.17 (cherry-pick)

tools/release/test_scripts.py

Index: tools/release/test_scripts.py
diff --git a/tools/release/test_scripts.py b/tools/release/test_scripts.py
index c47ebd1c2adc74d04d2e4594ea18714a21705084..4a3cb5b24a1f049772a85be0d29cee3fadc26722 100644
--- a/tools/release/test_scripts.py
+++ b/tools/release/test_scripts.py
@@ -391,20 +391,6 @@
       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:
-
-      content = """
-    'merges': [
-      # Only enabled on branches created with tools/release/create_release.py
-      # 'v8-merges@googlegroups.com',
-    ],
-"""
-      f.write(content)
-
   def MakeStep(self):
     """Convenience wrapper."""
     options = ScriptsBase(TEST_CONFIG, self, self._state).MakeOptions([])
@@ -968,8 +954,6 @@
       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 "
@@ -1000,18 +984,6 @@
 
     # Note: The version file is on build number 5 again in the end of this test
     # since the git command that merges to master is mocked out.
-
-    # Check for correct content of the WATCHLISTS file
-
-    watchlists_content = FileToText(os.path.join(TEST_CONFIG["DEFAULT_CWD"],
-                                          WATCHLISTS_FILE))
-    expected_watchlists_content = """
-    'merges': [
-      # Only enabled on branches created with tools/release/create_release.py
-      'v8-merges@googlegroups.com',
-    ],
-"""
-    self.assertEqual(watchlists_content, expected_watchlists_content)
 
   C_V8_22624_LOG = """V8 CL.