Clean up release scripts.

tools/push-to-trunk/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 27 matching lines @@
 import common_includes
 from common_includes import *
 import merge_to_branch
 from merge_to_branch import *
 import push_to_trunk
 from push_to_trunk import *
 import chromium_roll
 from chromium_roll import ChromiumRoll
 import releases
 from releases import Releases
-import bump_up_version
-from bump_up_version import BumpUpVersion
-from bump_up_version import LastChangeBailout
-from bump_up_version import LKGRVersionUpToDateBailout
 from auto_tag import AutoTag
 
 
 TEST_CONFIG = {
   "DEFAULT_CWD": None,
   "BRANCHNAME": "test-prepare-push",
-  "TRUNKBRANCH": "test-trunk-push",
-  "PERSISTFILE_BASENAME": "/tmp/test-v8-push-to-trunk-tempfile",
-  "CHANGELOG_ENTRY_FILE": "/tmp/test-v8-push-to-trunk-tempfile-changelog-entry",
-  "PATCH_FILE": "/tmp/test-v8-push-to-trunk-tempfile-patch",
-  "COMMITMSG_FILE": "/tmp/test-v8-push-to-trunk-tempfile-commitmsg",
-  "CHROMIUM": "/tmp/test-v8-push-to-trunk-tempfile-chromium",
+  "CANDIDATESBRANCH": "test-candidates-push",
+  "PERSISTFILE_BASENAME": "/tmp/test-v8-push-to-candidates-tempfile",
+  "CHANGELOG_ENTRY_FILE":
+      "/tmp/test-v8-push-to-candidates-tempfile-changelog-entry",
+  "PATCH_FILE": "/tmp/test-v8-push-to-candidates-tempfile-patch",
+  "COMMITMSG_FILE": "/tmp/test-v8-push-to-candidates-tempfile-commitmsg",
+  "CHROMIUM": "/tmp/test-v8-push-to-candidates-tempfile-chromium",
   "SETTINGS_LOCATION": None,
   "ALREADY_MERGING_SENTINEL_FILE":
       "/tmp/test-merge-to-branch-tempfile-already-merging",
   "TEMPORARY_PATCH_FILE": "/tmp/test-merge-to-branch-tempfile-temporary-patch",
   "CLUSTERFUZZ_API_KEY_FILE": "/tmp/test-fake-cf-api-key",
 }
 
 
 AUTO_PUSH_ARGS = [
   "-a", "author@chromium.org",
@@ skipping 295 matching lines @@
       f.write("  // Some line...\n")
       f.write("#define IS_CANDIDATE_VERSION 0\n")
 
   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=PushToTrunk, step_class=Step, args=None):
+  def RunStep(self, script=PushToCandidates, step_class=Step, args=None):
     """Convenience wrapper."""
     args = args if args is not None else ["-m"]
     return script(TEST_CONFIG, self, self._state).RunSteps([step_class], args)
 
   def Call(self, fun, *args, **kwargs):
     print "Calling %s with %s and %s" % (str(fun), str(args), str(kwargs))
 
   def Command(self, cmd, args="", prefix="", pipe=True, cwd=None):
     print "%s %s" % (cmd, args)
     print "in %s" % cwd
@@ skipping 143 matching lines @@
                      MSub(r"(?<=#define BUILD_NUMBER)(?P<space>\s+)\d*$",
                           r"\g<space>3",
                           "//\n#define BUILD_NUMBER  321\n"))
 
   def testPreparePushRevision(self):
     # Tests the default push hash used when the --revision option is not set.
     self.Expect([
       Cmd("git log -1 --format=%H HEAD", "push_hash")
     ])
 
-    self.RunStep(PushToTrunk, PreparePushRevision)
+    self.RunStep(PushToCandidates, PreparePushRevision)
     self.assertEquals("push_hash", self._state["push_hash"])
 
   def testPrepareChangeLog(self):
     self.WriteFakeVersionFile()
     TEST_CONFIG["CHANGELOG_ENTRY_FILE"] = self.MakeEmptyTempFile()
 
     self.Expect([
       Cmd("git log --format=%H 1234..push_hash", "rev1\nrev2\nrev3\nrev4"),
       Cmd("git log -1 --format=%s rev1", "Title text 1"),
       Cmd("git log -1 --format=%B rev1", "Title\n\nBUG=\nLOG=y\n"),
       Cmd("git log -1 --format=%an rev1", "author1@chromium.org"),
       Cmd("git log -1 --format=%s rev2", "Title text 2."),
       Cmd("git log -1 --format=%B rev2", "Title\n\nBUG=123\nLOG= \n"),
       Cmd("git log -1 --format=%an rev2", "author2@chromium.org"),
       Cmd("git log -1 --format=%s rev3", "Title text 3"),
       Cmd("git log -1 --format=%B rev3", "Title\n\nBUG=321\nLOG=true\n"),
       Cmd("git log -1 --format=%an rev3", "author3@chromium.org"),
       Cmd("git log -1 --format=%s rev4", "Title text 4"),
       Cmd("git log -1 --format=%B rev4",
        ("Title\n\nBUG=456\nLOG=Y\n\n"
         "Review URL: https://codereview.chromium.org/9876543210\n")),
       URL("https://codereview.chromium.org/9876543210/description",
           "Title\n\nBUG=456\nLOG=N\n\n"),
       Cmd("git log -1 --format=%an rev4", "author4@chromium.org"),
     ])
 
-    self._state["last_push_bleeding_edge"] = "1234"
+    self._state["last_push_master"] = "1234"
     self._state["push_hash"] = "push_hash"
     self._state["version"] = "3.22.5"
-    self.RunStep(PushToTrunk, PrepareChangeLog)
+    self.RunStep(PushToCandidates, PrepareChangeLog)
 
     actual_cl = FileToText(TEST_CONFIG["CHANGELOG_ENTRY_FILE"])
 
     expected_cl = """1999-07-31: Version 3.22.5
 
         Title text 1.
 
         Title text 3 (Chromium issue 321).
 
         Performance and stability improvements on all platforms.
@@ skipping 20 matching lines @@
 
   def testEditChangeLog(self):
     TEST_CONFIG["CHANGELOG_ENTRY_FILE"] = self.MakeEmptyTempFile()
     TextToFile("  New  \n\tLines  \n", TEST_CONFIG["CHANGELOG_ENTRY_FILE"])
     os.environ["EDITOR"] = "vi"
     self.Expect([
       RL(""),  # Open editor.
       Cmd("vi %s" % TEST_CONFIG["CHANGELOG_ENTRY_FILE"], ""),
     ])
 
-    self.RunStep(PushToTrunk, EditChangeLog)
+    self.RunStep(PushToCandidates, EditChangeLog)
 
     self.assertEquals("New\n        Lines",
                       FileToText(TEST_CONFIG["CHANGELOG_ENTRY_FILE"]))
 
   TAGS = """
 4425.0
 0.0.0.0
 3.9.6
 3.22.4
 test_tag
 """
 
   # Version as tag: 3.22.4.0. Version on master: 3.22.6.
   # Make sure that the latest version is 3.22.6.0.
   def testGetLatestVersion(self):
     self.Expect([
       Cmd("git tag", self.TAGS),
       Cmd("git checkout -f origin/master -- src/version.cc",
           "", cb=lambda: self.WriteFakeVersionFile(22, 6)),
     ])
 
-    self.RunStep(PushToTrunk, GetLatestVersion)
+    self.RunStep(PushToCandidates, GetLatestVersion)
 
     self.assertEquals("3", self._state["latest_major"])
     self.assertEquals("22", self._state["latest_minor"])
     self.assertEquals("6", self._state["latest_build"])
     self.assertEquals("0", self._state["latest_patch"])
 
   def _TestSquashCommits(self, change_log, expected_msg):
     TEST_CONFIG["CHANGELOG_ENTRY_FILE"] = self.MakeEmptyTempFile()
     with open(TEST_CONFIG["CHANGELOG_ENTRY_FILE"], "w") as f:
       f.write(change_log)
 
     self.Expect([
       Cmd("git diff origin/candidates hash1", "patch content"),
     ])
 
     self._state["push_hash"] = "hash1"
     self._state["date"] = "1999-11-11"
 
-    self.RunStep(PushToTrunk, SquashCommits)
+    self.RunStep(PushToCandidates, SquashCommits)
     self.assertEquals(FileToText(TEST_CONFIG["COMMITMSG_FILE"]), expected_msg)
 
     patch = FileToText(TEST_CONFIG["PATCH_FILE"])
     self.assertTrue(re.search(r"patch content", patch))
 
   def testSquashCommitsUnformatted(self):
     change_log = """1999-11-11: Version 3.22.5
 
         Log text 1.
         Chromium issue 12345
@@ skipping 33 matching lines @@
 
     # Use the test configuration without the fake testing default work dir.
     fake_config = dict(TEST_CONFIG)
     del(fake_config["DEFAULT_CWD"])
 
     self.Expect([
       Cmd("fetch v8", "", cwd=work_dir),
     ])
     FakeScript(fake_config, self).Run(["--work-dir", work_dir])
 
-  def _PushToTrunk(self, force=False, manual=False):
+  def _PushToCandidates(self, force=False, manual=False):
     TextToFile("", os.path.join(TEST_CONFIG["DEFAULT_CWD"], ".git"))
 
-    # The version file on bleeding edge has build level 5, while the version
-    # file from trunk has build level 4.
+    # The version file on master has build level 5, while the version
+    # file from candidates has build level 4.
     self.WriteFakeVersionFile(build=5)
 
     TEST_CONFIG["CHANGELOG_ENTRY_FILE"] = self.MakeEmptyTempFile()
-    bleeding_edge_change_log = "2014-03-17: Sentinel\n"
-    TextToFile(bleeding_edge_change_log,
+    master_change_log = "2014-03-17: Sentinel\n"
+    TextToFile(master_change_log,
                os.path.join(TEST_CONFIG["DEFAULT_CWD"], CHANGELOG_FILE))
     os.environ["EDITOR"] = "vi"
 
     commit_msg_squashed = """Version 3.22.5 (squashed - based on push_hash)
 
 Log text 1 (issue 321).
 
 Performance and stability improvements on all platforms."""
 
     commit_msg = """Version 3.22.5 (based on push_hash)
 
 Log text 1 (issue 321).
 
 Performance and stability improvements on all platforms."""
 
     def ResetChangeLog():
-      """On 'git co -b new_branch svn/trunk', and 'git checkout -- ChangeLog',
-      the ChangLog will be reset to its content on trunk."""
-      trunk_change_log = """1999-04-05: Version 3.22.4
+      """On 'git co -b new_branch origin/candidates',
+      and 'git checkout -- ChangeLog',
+      the ChangLog will be reset to its content on candidates."""
+      candidates_change_log = """1999-04-05: Version 3.22.4
 
         Performance and stability improvements on all platforms.\n"""
-      TextToFile(trunk_change_log,
+      TextToFile(candidates_change_log,
                  os.path.join(TEST_CONFIG["DEFAULT_CWD"], CHANGELOG_FILE))
 
-    def ResetToTrunk():
+    def ResetToCandidates():
       ResetChangeLog()
       self.WriteFakeVersionFile()
 
     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 MINOR_VERSION\s+22", version))
       self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version))
       self.assertFalse(re.search(r"#define BUILD_NUMBER\s+6", version))
       self.assertTrue(re.search(r"#define PATCH_LEVEL\s+0", version))
       self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version))
 
-      # Check that the change log on the trunk branch got correctly modified.
+      # 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).
 
         Performance and stability improvements on all platforms.
 
 
@@ skipping 37 matching lines @@
     if manual:
       expectations.append(RL(""))  # Open editor.
     if not force:
       expectations.append(
           Cmd("vi %s" % TEST_CONFIG["CHANGELOG_ENTRY_FILE"], ""))
     expectations += [
       Cmd("git fetch", ""),
       Cmd("git checkout -f origin/master", ""),
       Cmd("git diff origin/candidates push_hash", "patch content\n"),
       Cmd(("git new-branch %s --upstream origin/candidates" %
-           TEST_CONFIG["TRUNKBRANCH"]), "", cb=ResetToTrunk),
+           TEST_CONFIG["CANDIDATESBRANCH"]), "", cb=ResetToCandidates),
       Cmd("git apply --index --reject \"%s\"" % TEST_CONFIG["PATCH_FILE"], ""),
       Cmd("git checkout -f origin/candidates -- ChangeLog", "",
           cb=ResetChangeLog),
       Cmd("git checkout -f origin/candidates -- src/version.cc", "",
           cb=self.WriteFakeVersionFile),
       Cmd("git commit -am \"%s\"" % commit_msg_squashed, ""),
     ]
     if manual:
       expectations.append(RL("Y"))  # Sanity check.
     expectations += [
       Cmd("git cl land -f --bypass-hooks", ""),
       Cmd("git checkout -f master", ""),
       Cmd("git fetch", ""),
-      Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""),
+      Cmd("git branch -D %s" % TEST_CONFIG["CANDIDATESBRANCH"], ""),
       Cmd(("git new-branch %s --upstream origin/candidates" %
-           TEST_CONFIG["TRUNKBRANCH"]), "", cb=ResetToTrunk),
+           TEST_CONFIG["CANDIDATESBRANCH"]), "", cb=ResetToCandidates),
       Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
           cb=CheckVersionCommit),
       Cmd("git cl land -f --bypass-hooks", ""),
       Cmd("git fetch", ""),
       Cmd("git log -1 --format=%H --grep="
           "\"Version 3.22.5 (based on push_hash)\""
           " origin/candidates", "hsh_to_tag"),
       Cmd("git tag 3.22.5 hsh_to_tag", ""),
       Cmd("git push origin 3.22.5", ""),
       Cmd("git checkout -f some_branch", ""),
       Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
-      Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""),
+      Cmd("git branch -D %s" % TEST_CONFIG["CANDIDATESBRANCH"], ""),
     ]
     self.Expect(expectations)
 
     args = ["-a", "author@chromium.org", "--revision", "push_hash"]
     if force: args.append("-f")
     if manual: args.append("-m")
     else: args += ["-r", "reviewer@chromium.org"]
-    PushToTrunk(TEST_CONFIG, self).Run(args)
+    PushToCandidates(TEST_CONFIG, self).Run(args)
 
     cl = FileToText(os.path.join(TEST_CONFIG["DEFAULT_CWD"], CHANGELOG_FILE))
     self.assertTrue(re.search(r"^\d\d\d\d\-\d+\-\d+: Version 3\.22\.5", cl))
     self.assertTrue(re.search(r"        Log text 1 \(issue 321\).", cl))
     self.assertTrue(re.search(r"1999\-04\-05: Version 3\.22\.4", cl))
 
     # Note: The version file is on build number 5 again in the end of this test
-    # since the git command that merges to the bleeding edge branch is mocked
-    # out.
+    # since the git command that merges to master is mocked out.
 
-  def testPushToTrunkManual(self):
-    self._PushToTrunk(manual=True)
+  def testPushToCandidatesManual(self):
+    self._PushToCandidates(manual=True)
 
-  def testPushToTrunkSemiAutomatic(self):
-    self._PushToTrunk()
+  def testPushToCandidatesSemiAutomatic(self):
+    self._PushToCandidates()
 
-  def testPushToTrunkForced(self):
-    self._PushToTrunk(force=True)
+  def testPushToCandidatesForced(self):
+    self._PushToCandidates(force=True)
 
   C_V8_22624_LOG = """V8 CL.
 
 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
 
 """
 
   C_V8_123455_LOG = """V8 CL.
 
 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@123455 123
@@ skipping 71 matching lines @@
       Cmd("git log -1 --format=%s hash2",
           "Version 3.4.5 (based on abc123)\n"),
     ])
 
     self._state["candidate"] = "abc123"
     self.assertEquals(0, self.RunStep(
         auto_push.AutoPush, CheckLastPush, AUTO_PUSH_ARGS))
 
   def testAutoPush(self):
     TextToFile("", os.path.join(TEST_CONFIG["DEFAULT_CWD"], ".git"))
-    TEST_CONFIG["SETTINGS_LOCATION"] = "~/.doesnotexist"
 
     self.Expect([
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch\n"),
       Cmd("git fetch", ""),
-      URL("https://v8-status.appspot.com/current?format=json",
-          "{\"message\": \"Tree is throttled\"}"),
       Cmd("git fetch origin +refs/heads/candidate:refs/heads/candidate", ""),
       Cmd("git show-ref -s refs/heads/candidate", "abc123\n"),
       Cmd(("git log -1 --format=%H --grep=\""
            "^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\""
            " origin/candidates"), "push_hash\n"),
       Cmd("git log -1 --format=%s push_hash",
           "Version 3.4.5 (based on abc101)\n"),
     ])
 
     auto_push.AutoPush(TEST_CONFIG, self).Run(AUTO_PUSH_ARGS + ["--push"])
 
     state = json.loads(FileToText("%s-state.json"
                                   % TEST_CONFIG["PERSISTFILE_BASENAME"]))
 
     self.assertEquals("abc123", state["candidate"])
 
-  def testAutoPushStoppedBySettings(self):
-    TextToFile("", os.path.join(TEST_CONFIG["DEFAULT_CWD"], ".git"))
-    TEST_CONFIG["SETTINGS_LOCATION"] = self.MakeEmptyTempFile()
-    TextToFile("{\"enable_auto_push\": false}",
-               TEST_CONFIG["SETTINGS_LOCATION"])
-
-    self.Expect([
-      Cmd("git status -s -uno", ""),
-      Cmd("git status -s -b -uno", "## some_branch\n"),
-      Cmd("git fetch", ""),
-    ])
-
-    def RunAutoPush():
-      auto_push.AutoPush(TEST_CONFIG, self).Run(AUTO_PUSH_ARGS)
-    self.assertRaises(Exception, RunAutoPush)
-
-  def testAutoPushStoppedByTreeStatus(self):
-    TextToFile("", os.path.join(TEST_CONFIG["DEFAULT_CWD"], ".git"))
-    TEST_CONFIG["SETTINGS_LOCATION"] = "~/.doesnotexist"
-
-    self.Expect([
-      Cmd("git status -s -uno", ""),
-      Cmd("git status -s -b -uno", "## some_branch\n"),
-      Cmd("git fetch", ""),
-      URL("https://v8-status.appspot.com/current?format=json",
-          "{\"message\": \"Tree is throttled (no push)\"}"),
-    ])
-
-    def RunAutoPush():
-      auto_push.AutoPush(TEST_CONFIG, self).Run(AUTO_PUSH_ARGS)
-    self.assertRaises(Exception, RunAutoPush)
-
   def testAutoRollExistingRoll(self):
     self.Expect([
       URL("https://codereview.chromium.org/search",
           "owner=author%40chromium.org&limit=30&closed=3&format=json",
           ("{\"results\": [{\"subject\": \"different\"},"
            "{\"subject\": \"Update V8 to Version...\"}]}")),
     ])
 
     result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
         AUTO_PUSH_ARGS + ["-c", TEST_CONFIG["CHROMIUM"]])
@@ skipping 78 matching lines @@
 Title3
 
 Title1
 
 Revert "Something"
 
 BUG=123,234,345,456,567,v8:123
 LOG=N
 """
 
-    def VerifySVNCommit():
+    def VerifyLand():
       commit = FileToText(TEST_CONFIG["COMMITMSG_FILE"])
       self.assertEquals(msg, commit)
       version = FileToText(
           os.path.join(TEST_CONFIG["DEFAULT_CWD"], VERSION_FILE))
       self.assertTrue(re.search(r"#define MINOR_VERSION\s+22", version))
       self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version))
       self.assertTrue(re.search(r"#define PATCH_LEVEL\s+1", version))
       self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version))
 
     self.Expect([
@@ skipping 52 matching lines @@
       Cmd("git apply --index --reject \"%s\"" % extra_patch, ""),
       RL("Y"),  # Automatically increment patch level?
       Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], ""),
       RL("reviewer@chromium.org"),  # V8 reviewer.
       Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" "
           "--bypass-hooks --cc \"ulan@chromium.org\"", ""),
       Cmd("git checkout -f %s" % TEST_CONFIG["BRANCHNAME"], ""),
       RL("LGTM"),  # Enter LGTM for V8 CL.
       Cmd("git cl presubmit", "Presubmit successfull\n"),
       Cmd("git cl land -f --bypass-hooks", "Closing issue\n",
-          cb=VerifySVNCommit),
+          cb=VerifyLand),
       Cmd("git fetch", ""),
       Cmd("git log -1 --format=%H --grep=\""
           "Version 3.22.5.1 (cherry-pick)"
           "\" origin/candidates",
           ""),
       Cmd("git fetch", ""),
       Cmd("git log -1 --format=%H --grep=\""
           "Version 3.22.5.1 (cherry-pick)"
           "\" origin/candidates",
           "hsh_to_tag"),
@@ skipping 204 matching lines @@
         "branch": "3.3",
         "review_link": "fake.com",
         "date": "18:15",
         "chromium_branch": "",
         "revision_link": "https://code.google.com/p/v8/source/detail?r=234",
       },
     ]
     self.assertEquals(expected_json, json.loads(FileToText(json_output)))
 
 
-  def _bumpUpVersion(self):
-    self.WriteFakeVersionFile()
-
-    def ResetVersion(minor, build, patch=0):
-      return lambda: self.WriteFakeVersionFile(minor=minor,
-                                               build=build,
-                                               patch=patch)
-
-    return [
-      Cmd("git status -s -uno", ""),
-      Cmd("git checkout -f master", "", cb=ResetVersion(11, 4)),
-      Cmd("git pull", ""),
-      Cmd("git branch", ""),
-      Cmd("git checkout -f master", ""),
-      Cmd("git log -1 --format=%H", "latest_hash"),
-      Cmd("git diff --name-only latest_hash latest_hash^", ""),
-      URL("https://v8-status.appspot.com/lkgr", "12345"),
-      Cmd("git checkout -f master", ""),
-      Cmd(("git log --format=%H --grep="
-           "\"^git-svn-id: [^@]*@12345 [A-Za-z0-9-]*$\""),
-          "lkgr_hash"),
-      Cmd("git new-branch auto-bump-up-version --upstream lkgr_hash", ""),
-      Cmd("git checkout -f master", ""),
-      Cmd("git branch", "auto-bump-up-version\n* master"),
-      Cmd("git branch -D auto-bump-up-version", ""),
-      Cmd("git diff --name-only lkgr_hash lkgr_hash^", ""),
-      Cmd("git checkout -f candidates", "", cb=ResetVersion(11, 5)),
-      Cmd("git pull", ""),
-      URL("https://v8-status.appspot.com/current?format=json",
-          "{\"message\": \"Tree is open\"}"),
-      Cmd("git new-branch auto-bump-up-version --upstream master", "",
-          cb=ResetVersion(11, 4)),
-      Cmd("git commit -am \"[Auto-roll] Bump up version to 3.11.6.0\n\n"
-          "TBR=author@chromium.org\" "
-          "--author \"author@chromium.org <author@chromium.org>\"", ""),
-    ]
-
-  def testBumpUpVersionGit(self):
-    expectations = self._bumpUpVersion()
-    expectations += [
-      Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f "
-          "--bypass-hooks", ""),
-      Cmd("git cl land -f --bypass-hooks", ""),
-      Cmd("git checkout -f master", ""),
-      Cmd("git branch", "auto-bump-up-version\n* master"),
-      Cmd("git branch -D auto-bump-up-version", ""),
-    ]
-    self.Expect(expectations)
-
-    BumpUpVersion(TEST_CONFIG, self).Run(["-a", "author@chromium.org"])
-
-
-  # Test that we bail out if the last change was a version change.
-  def testBumpUpVersionBailout1(self):
-    self._state["latest"] = "latest_hash"
-
-    self.Expect([
-      Cmd("git diff --name-only latest_hash latest_hash^", VERSION_FILE),
-    ])
-
-    self.assertEquals(0,
-        self.RunStep(BumpUpVersion, LastChangeBailout, ["--dry_run"]))
-
-  # Test that we bail out if the lkgr was a version change.
-  def testBumpUpVersionBailout2(self):
-    self._state["lkgr"] = "lkgr_hash"
-
-    self.Expect([
-      Cmd("git diff --name-only lkgr_hash lkgr_hash^", VERSION_FILE),
-    ])
-
-    self.assertEquals(0,
-        self.RunStep(BumpUpVersion, LKGRVersionUpToDateBailout, ["--dry_run"]))
-
-  # Test that we bail out if the last version is already newer than the lkgr's
-  # version.
-  def testBumpUpVersionBailout3(self):
-    self._state["lkgr"] = "lkgr_hash"
-    self._state["lkgr_version"] = "3.22.4.0"
-    self._state["latest_version"] = "3.22.5.0"
-
-    self.Expect([
-      Cmd("git diff --name-only lkgr_hash lkgr_hash^", ""),
-    ])
-
-    self.assertEquals(0,
-        self.RunStep(BumpUpVersion, LKGRVersionUpToDateBailout, ["--dry_run"]))
-
-
 class SystemTest(unittest.TestCase):
   def testReload(self):
     options = ScriptsBase(
         TEST_CONFIG, DEFAULT_SIDE_EFFECT_HANDLER, {}).MakeOptions([])
     step = MakeStep(step_class=PrepareChangeLog, number=0, state={}, config={},
                     options=options,
                     side_effect_handler=DEFAULT_SIDE_EFFECT_HANDLER)
     body = step.Reload(
 """------------------------------------------------------------------------
 r17997 | machenbach@chromium.org | 2013-11-22 11:04:04 +0100 (...) | 6 lines
 
 Prepare push to trunk.  Now working on version 3.23.11.
 
 R=danno@chromium.org
 
 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)