Refactoring: Remove global configs in 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 16 matching lines @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import os
 import shutil
 import tempfile
 import traceback
 import unittest
 
 import auto_push
 from auto_push import CheckLastPush
-from auto_push import SETTINGS_LOCATION
 import auto_roll
-from auto_roll import CLUSTERFUZZ_API_KEY_FILE
 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 CHROMIUM
 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_FILE: None,
-  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",
-  SETTINGS_LOCATION: None,
-  ALREADY_MERGING_SENTINEL_FILE:
+  "BRANCHNAME": "test-prepare-push",
+  "TRUNKBRANCH": "test-trunk-push",
+  "PERSISTFILE_BASENAME": "/tmp/test-v8-push-to-trunk-tempfile",
+  "CHANGELOG_FILE": None,
+  "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",
+  "SETTINGS_LOCATION": None,
+  "ALREADY_MERGING_SENTINEL_FILE":
       "/tmp/test-merge-to-branch-tempfile-already-merging",
-  COMMIT_HASHES_FILE: "/tmp/test-merge-to-branch-tempfile-PATCH_COMMIT_HASHES",
-  TEMPORARY_PATCH_FILE: "/tmp/test-merge-to-branch-tempfile-temporary-patch",
-  CLUSTERFUZZ_API_KEY_FILE: "/tmp/test-fake-cf-api-key",
+  "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",
   "-r", "reviewer@chromium.org",
 ]
 
 
 class ToplevelTest(unittest.TestCase):
@@ skipping 337 matching lines @@
     """Convenience wrapper."""
     self._mock.Expect(*args)
 
   def setUp(self):
     self._mock = SimpleMock()
     self._tmp_files = []
     self._state = {}
     TEST_CONFIG["DEFAULT_CWD"] = self.MakeEmptyTempDirectory()
 
   def tearDown(self):
-    if os.path.exists(TEST_CONFIG[PERSISTFILE_BASENAME]):
-      shutil.rmtree(TEST_CONFIG[PERSISTFILE_BASENAME])
+    if os.path.exists(TEST_CONFIG["PERSISTFILE_BASENAME"]):
+      shutil.rmtree(TEST_CONFIG["PERSISTFILE_BASENAME"])
 
     # Clean up temps. Doesn't work automatically.
     for name in self._tmp_files:
       if os.path.isfile(name):
         os.remove(name)
       if os.path.isdir(name):
         shutil.rmtree(name)
 
     self._mock.AssertFinished()
 
   def testGitMock(self):
     self.Expect([Cmd("git --version", "git version 1.2.3"),
                  Cmd("git dummy", "")])
     self.assertEquals("git version 1.2.3", self.MakeStep().Git("--version"))
     self.assertEquals("", self.MakeStep().Git("dummy"))
 
   def testCommonPrepareDefault(self):
     self.Expect([
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch"),
       Cmd("git svn fetch", ""),
-      Cmd("git branch", "  branch1\n* %s" % TEST_CONFIG[BRANCHNAME]),
+      Cmd("git branch", "  branch1\n* %s" % TEST_CONFIG["BRANCHNAME"]),
       RL("Y"),
-      Cmd("git branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
+      Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
     ])
     self.MakeStep().CommonPrepare()
     self.MakeStep().PrepareBranch()
     self.assertEquals("some_branch", self._state["current_branch"])
 
   def testCommonPrepareNoConfirm(self):
     self.Expect([
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch"),
       Cmd("git svn fetch", ""),
-      Cmd("git branch", "  branch1\n* %s" % TEST_CONFIG[BRANCHNAME]),
+      Cmd("git branch", "  branch1\n* %s" % TEST_CONFIG["BRANCHNAME"]),
       RL("n"),
     ])
     self.MakeStep().CommonPrepare()
     self.assertRaises(Exception, self.MakeStep().PrepareBranch)
     self.assertEquals("some_branch", self._state["current_branch"])
 
   def testCommonPrepareDeleteBranchFailure(self):
     self.Expect([
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch"),
       Cmd("git svn fetch", ""),
-      Cmd("git branch", "  branch1\n* %s" % TEST_CONFIG[BRANCHNAME]),
+      Cmd("git branch", "  branch1\n* %s" % TEST_CONFIG["BRANCHNAME"]),
       RL("Y"),
-      Cmd("git branch -D %s" % TEST_CONFIG[BRANCHNAME], None),
+      Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], None),
     ])
     self.MakeStep().CommonPrepare()
     self.assertRaises(Exception, self.MakeStep().PrepareBranch)
     self.assertEquals("some_branch", self._state["current_branch"])
 
   def testInitialEnvironmentChecks(self):
     TextToFile("", os.path.join(TEST_CONFIG["DEFAULT_CWD"], ".git"))
     os.environ["EDITOR"] = "vi"
     self.Expect([
       Cmd("which vi", "/usr/bin/vi"),
@@ skipping 34 matching lines @@
     # 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.assertEquals("push_hash", self._state["push_hash"])
 
   def testPrepareChangeLog(self):
     self.WriteFakeVersionFile()
-    TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
+    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["push_hash"] = "push_hash"
     self._state["version"] = "3.22.5"
     self.RunStep(PushToTrunk, PrepareChangeLog)
 
-    actual_cl = FileToText(TEST_CONFIG[CHANGELOG_ENTRY_FILE])
+    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.
 #
 # The change log above is auto-generated. Please review if all relevant
@@ skipping 10 matching lines @@
 #       (author3@chromium.org)
 #
 #       Title text 4 (Chromium issue 456).
 #       (author4@chromium.org)
 #
 #"""
 
     self.assertEquals(expected_cl, actual_cl)
 
   def testEditChangeLog(self):
-    TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
-    TextToFile("  New  \n\tLines  \n", TEST_CONFIG[CHANGELOG_ENTRY_FILE])
+    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], ""),
+      Cmd("vi %s" % TEST_CONFIG["CHANGELOG_ENTRY_FILE"], ""),
     ])
 
     self.RunStep(PushToTrunk, EditChangeLog)
 
     self.assertEquals("New\n        Lines",
-                      FileToText(TEST_CONFIG[CHANGELOG_ENTRY_FILE]))
+                      FileToText(TEST_CONFIG["CHANGELOG_ENTRY_FILE"]))
 
   # Version on trunk: 3.22.4.0. Version on master (bleeding_edge): 3.22.6.
   # Make sure that the increment is 3.22.7.0.
   def testIncrementVersion(self):
     self.WriteFakeVersionFile()
     self._state["last_push_trunk"] = "hash1"
     self._state["latest_build"] = "6"
     self._state["latest_version"] = "3.22.6.0"
 
     self.Expect([
       Cmd("git checkout -f hash1 -- src/version.cc", ""),
       Cmd("git checkout -f svn/bleeding_edge -- src/version.cc",
           "", cb=lambda: self.WriteFakeVersionFile(22, 6)),
       RL("Y"),  # Increment build number.
     ])
 
     self.RunStep(PushToTrunk, IncrementVersion)
 
     self.assertEquals("3", self._state["new_major"])
     self.assertEquals("22", self._state["new_minor"])
     self.assertEquals("7", self._state["new_build"])
     self.assertEquals("0", self._state["new_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:
+    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 svn/trunk hash1", "patch content"),
       Cmd("git svn find-rev hash1", "123455\n"),
     ])
 
     self._state["push_hash"] = "hash1"
     self._state["date"] = "1999-11-11"
 
     self.RunStep(PushToTrunk, SquashCommits)
-    self.assertEquals(FileToText(TEST_CONFIG[COMMITMSG_FILE]), expected_msg)
+    self.assertEquals(FileToText(TEST_CONFIG["COMMITMSG_FILE"]), expected_msg)
 
-    patch = FileToText(TEST_CONFIG[ PATCH_FILE])
+    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
 
         Performance and stability improvements on all platforms.\n"""
     commit_msg = """Version 3.22.5 (based on bleeding_edge revision r123455)
@@ skipping 22 matching lines @@
     commit_msg = """Line with "quotation marks"."""
     self._TestSquashCommits(change_log, commit_msg)
 
   def _PushToTrunk(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.
     self.WriteFakeVersionFile(build=5)
 
-    TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
-    TEST_CONFIG[CHANGELOG_FILE] = self.MakeEmptyTempFile()
+    TEST_CONFIG["CHANGELOG_ENTRY_FILE"] = self.MakeEmptyTempFile()
+    TEST_CONFIG["CHANGELOG_FILE"] = self.MakeEmptyTempFile()
     bleeding_edge_change_log = "2014-03-17: Sentinel\n"
-    TextToFile(bleeding_edge_change_log, TEST_CONFIG[CHANGELOG_FILE])
+    TextToFile(bleeding_edge_change_log, TEST_CONFIG["CHANGELOG_FILE"])
     os.environ["EDITOR"] = "vi"
 
     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
 
         Performance and stability improvements on all platforms.\n"""
-      TextToFile(trunk_change_log, TEST_CONFIG[CHANGELOG_FILE])
+      TextToFile(trunk_change_log, TEST_CONFIG["CHANGELOG_FILE"])
 
     def ResetToTrunk():
       ResetChangeLog()
       self.WriteFakeVersionFile()
 
     def CheckSVNCommit():
-      commit = FileToText(TEST_CONFIG[COMMITMSG_FILE])
+      commit = FileToText(TEST_CONFIG["COMMITMSG_FILE"])
       self.assertEquals(
 """Version 3.22.5 (based on bleeding_edge revision r123455)
 
 Log text 1 (issue 321).
 
 Performance and stability improvements on all platforms.""", 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.
-      change_log = FileToText(TEST_CONFIG[CHANGELOG_FILE])
+      change_log = FileToText(TEST_CONFIG["CHANGELOG_FILE"])
       self.assertEquals(
 """1999-07-31: Version 3.22.5
 
         Log text 1 (issue 321).
 
         Performance and stability improvements on all platforms.
 
 
 1999-04-05: Version 3.22.4
 
         Performance and stability improvements on all platforms.\n""",
           change_log)
 
     force_flag = " -f" if not manual else ""
     expectations = []
     if not force:
       expectations.append(Cmd("which vi", "/usr/bin/vi"))
     expectations += [
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch\n"),
       Cmd("git svn fetch", ""),
       Cmd("git branch", "  branch1\n* branch2\n"),
       Cmd("git branch", "  branch1\n* branch2\n"),
-      Cmd("git checkout -b %s svn/bleeding_edge" % TEST_CONFIG[BRANCHNAME],
+      Cmd("git checkout -b %s svn/bleeding_edge" % TEST_CONFIG["BRANCHNAME"],
           ""),
       Cmd("git svn find-rev r123455", "push_hash\n"),
       Cmd(("git log -1 --format=%H --grep="
            "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" "
            "svn/trunk"), "hash2\n"),
       Cmd("git log -1 hash2", "Log message\n"),
     ]
     if manual:
       expectations.append(RL("Y"))  # Confirm last push.
     expectations += [
       Cmd("git log -1 --format=%s hash2",
        "Version 3.4.5 (based on bleeding_edge revision r1234)\n"),
       Cmd("git svn find-rev r1234", "hash3\n"),
       Cmd("git checkout -f svn/bleeding_edge -- src/version.cc",
           "", cb=self.WriteFakeVersionFile),
       Cmd("git checkout -f hash2 -- src/version.cc", "",
           cb=self.WriteFakeVersionFile),
     ]
     if manual:
       expectations.append(RL(""))  # Increment build number.
     expectations += [
       Cmd("git log --format=%H hash3..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"),
     ]
     if manual:
       expectations.append(RL(""))  # Open editor.
     if not force:
-      expectations.append(Cmd("vi %s" % TEST_CONFIG[CHANGELOG_ENTRY_FILE], ""))
+      expectations.append(
+          Cmd("vi %s" % TEST_CONFIG["CHANGELOG_ENTRY_FILE"], ""))
     expectations += [
       Cmd("git svn fetch", "fetch result\n"),
       Cmd("git checkout -f svn/bleeding_edge", ""),
       Cmd("git diff svn/trunk push_hash", "patch content\n"),
       Cmd("git svn find-rev push_hash", "123455\n"),
-      Cmd("git checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], "",
+      Cmd("git checkout -b %s svn/trunk" % TEST_CONFIG["TRUNKBRANCH"], "",
           cb=ResetToTrunk),
-      Cmd("git apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""),
-      Cmd("git checkout -f svn/trunk -- %s" % TEST_CONFIG[CHANGELOG_FILE], "",
+      Cmd("git apply --index --reject \"%s\"" % TEST_CONFIG["PATCH_FILE"], ""),
+      Cmd("git checkout -f svn/trunk -- %s" % TEST_CONFIG["CHANGELOG_FILE"], "",
           cb=ResetChangeLog),
       Cmd("git checkout -f svn/trunk -- src/version.cc", "",
           cb=self.WriteFakeVersionFile),
-      Cmd("git commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "",
+      Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "",
           cb=CheckSVNCommit),
     ]
     if manual:
       expectations.append(RL("Y"))  # Sanity check.
     expectations += [
       Cmd("git svn dcommit 2>&1",
           "Some output\nCommitted r123456\nSome output\n"),
       Cmd("git svn tag 3.22.5 -m \"Tagging version 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["BRANCHNAME"], ""),
+      Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""),
     ]
     self.Expect(expectations)
 
     args = ["-a", "author@chromium.org", "--revision", "123455"]
     if force: args.append("-f")
     if manual: args.append("-m")
     else: args += ["-r", "reviewer@chromium.org"]
     PushToTrunk(TEST_CONFIG, self).Run(args)
 
-    cl = FileToText(TEST_CONFIG[CHANGELOG_FILE])
+    cl = FileToText(TEST_CONFIG["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.
 
   def testPushToTrunkManual(self):
     self._PushToTrunk(manual=True)
@@ skipping 16 matching lines @@
 
 """
 
   C_V8_123456_LOG = """V8 CL.
 
 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@123456 123
 
 """
 
   def testChromiumRoll(self):
-    googlers_mapping_py = "%s-mapping.py" % TEST_CONFIG[PERSISTFILE_BASENAME]
+    googlers_mapping_py = "%s-mapping.py" % TEST_CONFIG["PERSISTFILE_BASENAME"]
     with open(googlers_mapping_py, "w") as f:
       f.write("""
 def list_to_dict(entries):
   return {"g_name@google.com": "c_name@chromium.org"}
 def get_list():
   pass""")
 
     # Setup fake directory structures.
-    TEST_CONFIG[CHROMIUM] = self.MakeEmptyTempDirectory()
-    TextToFile("", os.path.join(TEST_CONFIG[CHROMIUM], ".git"))
-    chrome_dir = TEST_CONFIG[CHROMIUM]
+    TEST_CONFIG["CHROMIUM"] = self.MakeEmptyTempDirectory()
+    TextToFile("", os.path.join(TEST_CONFIG["CHROMIUM"], ".git"))
+    chrome_dir = TEST_CONFIG["CHROMIUM"]
     os.makedirs(os.path.join(chrome_dir, "v8"))
 
     # Write fake deps file.
     TextToFile("Some line\n   \"v8_revision\": \"123444\",\n  some line",
                os.path.join(chrome_dir, "DEPS"))
     def WriteDeps():
       TextToFile("Some line\n   \"v8_revision\": \"22624\",\n  some line",
                  os.path.join(chrome_dir, "DEPS"))
 
     expectations = [
@@ skipping 42 matching lines @@
     ])
 
     self._state["lkgr"] = "101"
 
     self.assertRaises(Exception, lambda: 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"
+    TEST_CONFIG["SETTINGS_LOCATION"] = "~/.doesnotexist"
 
     self.Expect([
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch\n"),
       Cmd("git svn fetch", ""),
       URL("https://v8-status.appspot.com/current?format=json",
           "{\"message\": \"Tree is throttled\"}"),
       URL("https://v8-status.appspot.com/lkgr", Exception("Network problem")),
       URL("https://v8-status.appspot.com/lkgr", "100"),
       Cmd(("git log -1 --format=%H --grep=\""
            "^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\""
            " svn/trunk"), "push_hash\n"),
       Cmd("git log -1 --format=%s push_hash",
           "Version 3.4.5 (based on bleeding_edge revision r79)\n"),
     ])
 
     auto_push.AutoPush(TEST_CONFIG, self).Run(AUTO_PUSH_ARGS + ["--push"])
 
     state = json.loads(FileToText("%s-state.json"
-                                  % TEST_CONFIG[PERSISTFILE_BASENAME]))
+                                  % TEST_CONFIG["PERSISTFILE_BASENAME"]))
 
     self.assertEquals("100", state["lkgr"])
 
   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])
+    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 svn 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"
+    TEST_CONFIG["SETTINGS_LOCATION"] = "~/.doesnotexist"
 
     self.Expect([
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch\n"),
       Cmd("git svn 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]])
+        AUTO_PUSH_ARGS + ["-c", TEST_CONFIG["CHROMIUM"]])
     self.assertEquals(0, result)
 
   # Snippet from the original DEPS file.
   FAKE_DEPS = """
 vars = {
   "v8_revision": "abcd123455",
 }
 deps = {
   "src/v8":
     (Var("googlecode_url") % "v8") + "/" + Var("v8_branch") + "@" +
     Var("v8_revision"),
 }
 """
 
   def testAutoRollUpToDate(self):
-    TEST_CONFIG[CHROMIUM] = self.MakeEmptyTempDirectory()
-    TextToFile(self.FAKE_DEPS, os.path.join(TEST_CONFIG[CHROMIUM], "DEPS"))
+    TEST_CONFIG["CHROMIUM"] = self.MakeEmptyTempDirectory()
+    TextToFile(self.FAKE_DEPS, os.path.join(TEST_CONFIG["CHROMIUM"], "DEPS"))
     self.Expect([
       URL("https://codereview.chromium.org/search",
           "owner=author%40chromium.org&limit=30&closed=3&format=json",
           ("{\"results\": [{\"subject\": \"different\"}]}")),
       Cmd(("git log -1 --format=%H --grep="
            "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" "
            "origin/master"), "push_hash\n"),
       Cmd("git log -1 --format=%B push_hash", self.C_V8_22624_LOG),
       Cmd("git log -1 --format=%B abcd123455", self.C_V8_123455_LOG),
     ])
 
     result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
-        AUTO_PUSH_ARGS + ["-c", TEST_CONFIG[CHROMIUM]])
+        AUTO_PUSH_ARGS + ["-c", TEST_CONFIG["CHROMIUM"]])
     self.assertEquals(0, result)
 
   def testAutoRoll(self):
-    TEST_CONFIG[CHROMIUM] = self.MakeEmptyTempDirectory()
-    TextToFile(self.FAKE_DEPS, os.path.join(TEST_CONFIG[CHROMIUM], "DEPS"))
-    TEST_CONFIG[CLUSTERFUZZ_API_KEY_FILE]  = self.MakeEmptyTempFile()
-    TextToFile("fake key", TEST_CONFIG[CLUSTERFUZZ_API_KEY_FILE])
+    TEST_CONFIG["CHROMIUM"] = self.MakeEmptyTempDirectory()
+    TextToFile(self.FAKE_DEPS, os.path.join(TEST_CONFIG["CHROMIUM"], "DEPS"))
+    TEST_CONFIG["CLUSTERFUZZ_API_KEY_FILE"]  = self.MakeEmptyTempFile()
+    TextToFile("fake key", TEST_CONFIG["CLUSTERFUZZ_API_KEY_FILE"])
 
     self.Expect([
       URL("https://codereview.chromium.org/search",
           "owner=author%40chromium.org&limit=30&closed=3&format=json",
           ("{\"results\": [{\"subject\": \"different\"}]}")),
       Cmd(("git log -1 --format=%H --grep="
            "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" "
            "origin/master"), "push_hash\n"),
       Cmd("git log -1 --format=%B push_hash", self.C_V8_123456_LOG),
       Cmd("git log -1 --format=%B abcd123455", self.C_V8_123455_LOG),
     ])
 
     result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
-        AUTO_PUSH_ARGS + ["-c", TEST_CONFIG[CHROMIUM], "--roll"])
+        AUTO_PUSH_ARGS + ["-c", TEST_CONFIG["CHROMIUM"], "--roll"])
     self.assertEquals(0, result)
 
   def testMergeToBranch(self):
-    TEST_CONFIG[ALREADY_MERGING_SENTINEL_FILE] = self.MakeEmptyTempFile()
+    TEST_CONFIG["ALREADY_MERGING_SENTINEL_FILE"] = self.MakeEmptyTempFile()
     TextToFile("", os.path.join(TEST_CONFIG["DEFAULT_CWD"], ".git"))
     self.WriteFakeVersionFile(build=5)
     os.environ["EDITOR"] = "vi"
     extra_patch = self.MakeEmptyTempFile()
 
     def VerifyPatch(patch):
       return lambda: self.assertEquals(patch,
-          FileToText(TEST_CONFIG[TEMPORARY_PATCH_FILE]))
+          FileToText(TEST_CONFIG["TEMPORARY_PATCH_FILE"]))
 
     msg = """Version 3.22.5.1 (merged r12345, r23456, r34567, r45678, r56789)
 
 Title4
 
 Title2
 
 Title3
 
 Title1
 
 Revert "Something"
 
 BUG=123,234,345,456,567,v8:123
 LOG=N
 """
 
     def VerifySVNCommit():
-      commit = FileToText(TEST_CONFIG[COMMITMSG_FILE])
+      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([
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch\n"),
       Cmd("git svn fetch", ""),
       Cmd("git branch", "  branch1\n* branch2\n"),
-      Cmd("git checkout -b %s svn/trunk" % TEST_CONFIG[BRANCHNAME], ""),
+      Cmd("git checkout -b %s svn/trunk" % TEST_CONFIG["BRANCHNAME"], ""),
       Cmd(("git log --format=%H --grep=\"Port r12345\" "
            "--reverse svn/bleeding_edge"),
           "hash1\nhash2"),
       Cmd("git svn find-rev hash1 svn/bleeding_edge", "45678"),
       Cmd("git log -1 --format=%s hash1", "Title1"),
       Cmd("git svn find-rev hash2 svn/bleeding_edge", "23456"),
       Cmd("git log -1 --format=%s hash2", "Title2"),
       Cmd(("git log --format=%H --grep=\"Port r23456\" "
            "--reverse svn/bleeding_edge"),
           ""),
@@ skipping 17 matching lines @@
       Cmd("git log -1 --format=%s hash3", "Title3"),
       Cmd("git log -1 --format=%s hash1", "Title1"),
       Cmd("git log -1 --format=%s hash5", "Revert \"Something\""),
       Cmd("git log -1 hash4", "Title4\nBUG=123\nBUG=234"),
       Cmd("git log -1 hash2", "Title2\n BUG = v8:123,345"),
       Cmd("git log -1 hash3", "Title3\nLOG=n\nBUG=567, 456"),
       Cmd("git log -1 hash1", "Title1\nBUG="),
       Cmd("git log -1 hash5", "Revert \"Something\"\nBUG=none"),
       Cmd("git log -1 -p hash4", "patch4"),
       Cmd(("git apply --index --reject \"%s\"" %
-           TEST_CONFIG[TEMPORARY_PATCH_FILE]),
+           TEST_CONFIG["TEMPORARY_PATCH_FILE"]),
           "", cb=VerifyPatch("patch4")),
       Cmd("git log -1 -p hash2", "patch2"),
       Cmd(("git apply --index --reject \"%s\"" %
-           TEST_CONFIG[TEMPORARY_PATCH_FILE]),
+           TEST_CONFIG["TEMPORARY_PATCH_FILE"]),
           "", cb=VerifyPatch("patch2")),
       Cmd("git log -1 -p hash3", "patch3"),
       Cmd(("git apply --index --reject \"%s\"" %
-           TEST_CONFIG[TEMPORARY_PATCH_FILE]),
+           TEST_CONFIG["TEMPORARY_PATCH_FILE"]),
           "", cb=VerifyPatch("patch3")),
       Cmd("git log -1 -p hash1", "patch1"),
       Cmd(("git apply --index --reject \"%s\"" %
-           TEST_CONFIG[TEMPORARY_PATCH_FILE]),
+           TEST_CONFIG["TEMPORARY_PATCH_FILE"]),
           "", cb=VerifyPatch("patch1")),
       Cmd("git log -1 -p hash5", "patch5\n"),
       Cmd(("git apply --index --reject \"%s\"" %
-           TEST_CONFIG[TEMPORARY_PATCH_FILE]),
+           TEST_CONFIG["TEMPORARY_PATCH_FILE"]),
           "", cb=VerifyPatch("patch5\n")),
       Cmd("git apply --index --reject \"%s\"" % extra_patch, ""),
       RL("Y"),  # Automatically increment patch level?
-      Cmd("git commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], ""),
+      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", ""),
-      Cmd("git checkout -f %s" % TEST_CONFIG[BRANCHNAME], ""),
+      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 dcommit -f --bypass-hooks", "Closing issue\n",
           cb=VerifySVNCommit),
       Cmd("git svn fetch", ""),
       Cmd(("git log -1 --format=%%H --grep=\"%s\" svn/trunk"
            % msg.replace("\"", "\\\"")), "hash6"),
       Cmd("git svn find-rev hash6", "1324"),
       Cmd(("svn copy -r 1324 https://v8.googlecode.com/svn/trunk "
            "https://v8.googlecode.com/svn/tags/3.22.5.1 -m "
            "\"Tagging version 3.22.5.1\""), ""),
       Cmd("git checkout -f some_branch", ""),
-      Cmd("git branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
+      Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
     ])
 
     # r12345 and r34567 are patches. r23456 (included) and r45678 are the MIPS
     # ports of r12345. r56789 is the MIPS port of r34567.
     args = ["-f", "-p", extra_patch, "--branch", "trunk", "12345", "23456",
             "34567"]
 
     # The first run of the script stops because of the svn being down.
     self.assertRaises(GitFailedException,
         lambda: MergeToBranch(TEST_CONFIG, self).Run(args))
@@ skipping 47 matching lines @@
 """
     c_hash3_commit_log = """Simple.
 
 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3456 0039-1c4b
 
 """
     json_output = self.MakeEmptyTempFile()
     csv_output = self.MakeEmptyTempFile()
     self.WriteFakeVersionFile()
 
-    TEST_CONFIG[CHROMIUM] = self.MakeEmptyTempDirectory()
-    chrome_dir = TEST_CONFIG[CHROMIUM]
+    TEST_CONFIG["CHROMIUM"] = self.MakeEmptyTempDirectory()
+    chrome_dir = TEST_CONFIG["CHROMIUM"]
     chrome_v8_dir = os.path.join(chrome_dir, "v8")
     os.makedirs(chrome_v8_dir)
     def WriteDEPS(revision):
       TextToFile("Line\n   \"v8_revision\": \"%s\",\n  line\n" % revision,
                  os.path.join(chrome_dir, "DEPS"))
     WriteDEPS(567)
 
     def ResetVersion(minor, build, patch=0):
       return lambda: self.WriteFakeVersionFile(minor=minor,
                                                build=build,
                                                patch=patch)
 
     def ResetDEPS(revision):
       return lambda: WriteDEPS(revision)
 
     self.Expect([
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch\n"),
       Cmd("git svn fetch", ""),
       Cmd("git branch", "  branch1\n* branch2\n"),
-      Cmd("git checkout -b %s" % TEST_CONFIG[BRANCHNAME], ""),
+      Cmd("git checkout -b %s" % TEST_CONFIG["BRANCHNAME"], ""),
       Cmd("git branch -r", "  svn/3.21\n  svn/3.3\n"),
       Cmd("git reset --hard svn/3.3", ""),
       Cmd("git log --format=%H", "hash1\nhash2"),
       Cmd("git diff --name-only hash1 hash1^", ""),
       Cmd("git diff --name-only hash2 hash2^", VERSION_FILE),
       Cmd("git checkout -f hash2 -- %s" % VERSION_FILE, "",
           cb=ResetVersion(3, 1, 1)),
       Cmd("git log -1 --format=%B hash2",
           "Version 3.3.1.1 (merged 12)\n\nReview URL: fake.com\n"),
       Cmd("git log -1 --format=%s hash2", ""),
@@ skipping 28 matching lines @@
           tag_response_text),
       Cmd("git svn find-rev r22626", "hash_22626"),
       Cmd("git svn find-rev hash_22626", "22626"),
       Cmd("git log -1 --format=%ci hash_22626", "01:23"),
       Cmd("git svn find-rev r22624", "hash_22624"),
       Cmd("git svn find-rev hash_22624", "22624"),
       Cmd("git log -1 --format=%ci hash_22624", "02:34"),
       Cmd("git status -s -uno", "", cwd=chrome_dir),
       Cmd("git checkout -f master", "", cwd=chrome_dir),
       Cmd("git pull", "", cwd=chrome_dir),
-      Cmd("git checkout -b %s" % TEST_CONFIG[BRANCHNAME], "", cwd=chrome_dir),
+      Cmd("git checkout -b %s" % TEST_CONFIG["BRANCHNAME"], "", cwd=chrome_dir),
       Cmd("git fetch origin", "", cwd=chrome_v8_dir),
       Cmd("git log --format=%H --grep=\"V8\"", "c_hash1\nc_hash2\nc_hash3\n",
           cwd=chrome_dir),
       Cmd("git diff --name-only c_hash1 c_hash1^", "", cwd=chrome_dir),
       Cmd("git diff --name-only c_hash2 c_hash2^", "DEPS", cwd=chrome_dir),
       Cmd("git checkout -f c_hash2 -- DEPS", "",
           cb=ResetDEPS("0123456789012345678901234567890123456789"),
           cwd=chrome_dir),
       Cmd("git log -1 --format=%B c_hash2", c_hash2_commit_log,
           cwd=chrome_dir),
       Cmd("git rev-list -n 1 0123456789012345678901234567890123456789",
           "0123456789012345678901234567890123456789", cwd=chrome_v8_dir),
       Cmd("git log -1 --format=%B 0123456789012345678901234567890123456789",
           self.C_V8_22624_LOG, cwd=chrome_v8_dir),
       Cmd("git diff --name-only c_hash3 c_hash3^", "DEPS", cwd=chrome_dir),
       Cmd("git checkout -f c_hash3 -- DEPS", "", cb=ResetDEPS(345),
           cwd=chrome_dir),
       Cmd("git log -1 --format=%B c_hash3", c_hash3_commit_log,
           cwd=chrome_dir),
       Cmd("git checkout -f HEAD -- DEPS", "", cb=ResetDEPS(567),
           cwd=chrome_dir),
       Cmd("git branch -r", " weird/123\n  branch-heads/7\n", cwd=chrome_dir),
       Cmd("git checkout -f branch-heads/7 -- DEPS", "", cb=ResetDEPS(345),
           cwd=chrome_dir),
       Cmd("git checkout -f HEAD -- DEPS", "", cb=ResetDEPS(567),
           cwd=chrome_dir),
       Cmd("git checkout -f master", "", cwd=chrome_dir),
-      Cmd("git branch -D %s" % TEST_CONFIG[BRANCHNAME], "", cwd=chrome_dir),
+      Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], "", cwd=chrome_dir),
       Cmd("git checkout -f some_branch", ""),
-      Cmd("git branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
+      Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
     ])
 
-    args = ["-c", TEST_CONFIG[CHROMIUM],
+    args = ["-c", TEST_CONFIG["CHROMIUM"],
             "--json", json_output,
             "--csv", csv_output,
             "--max-releases", "1"]
     Releases(TEST_CONFIG, self).Run(args)
 
     # Check expected output.
     csv = ("3.28.41,bleeding_edge,22626,,\r\n"
            "3.28.40,bleeding_edge,22624,4567,\r\n"
            "3.22.3,trunk,345,3456:4566,\r\n"
            "3.21.2,3.21,123,,\r\n"
@@ skipping 70 matching lines @@
       Cmd("git cl dcommit -f --bypass-hooks", ""),
       Cmd("git checkout -f bleeding_edge", ""),
       Cmd("git branch", "auto-bump-up-version\n* bleeding_edge"),
       Cmd("git branch -D auto-bump-up-version", ""),
     ]
     self.Expect(expectations)
 
     BumpUpVersion(TEST_CONFIG, self).Run(["-a", "author@chromium.org"])
 
   def testBumpUpVersionSvn(self):
+    svn_root = self.MakeEmptyTempDirectory()
     expectations = self._bumpUpVersion()
     expectations += [
       Cmd("git diff HEAD^ HEAD", "patch content"),
-      Cmd("svn update", "", cwd="[SVN_ROOT]"),
-      Cmd("svn status", "", cwd="[SVN_ROOT]"),
+      Cmd("svn update", "", cwd=svn_root),
+      Cmd("svn status", "", cwd=svn_root),
       Cmd("patch -d branches/bleeding_edge -p1 -i %s" %
-          TEST_CONFIG[PATCH_FILE], "Applied patch...", cwd="[SVN_ROOT]"),
+          TEST_CONFIG["PATCH_FILE"], "Applied patch...", cwd=svn_root),
       Cmd("svn commit --non-interactive --username=author@chromium.org "
           "--config-dir=[CONFIG_DIR] "
           "-m \"[Auto-roll] Bump up version to 3.11.6.0\"",
-          "", cwd="[SVN_ROOT]"),
+          "", cwd=svn_root),
       Cmd("git checkout -f bleeding_edge", ""),
       Cmd("git branch", "auto-bump-up-version\n* bleeding_edge"),
       Cmd("git branch -D auto-bump-up-version", ""),
     ]
     self.Expect(expectations)
 
     BumpUpVersion(TEST_CONFIG, self).Run(
         ["-a", "author@chromium.org",
-         "--svn", "[SVN_ROOT]",
+         "--svn", svn_root,
          "--svn-config", "[CONFIG_DIR]"])
 
   def testAutoTag(self):
     self.WriteFakeVersionFile()
 
     def ResetVersion(minor, build, patch=0):
       return lambda: self.WriteFakeVersionFile(minor=minor,
                                                build=build,
                                                patch=patch)
 
     self.Expect([
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch\n"),
       Cmd("git svn fetch", ""),
       Cmd("git branch", "  branch1\n* branch2\n"),
       Cmd("git checkout -f master", ""),
       Cmd("git svn rebase", ""),
-      Cmd("git checkout -b %s" % TEST_CONFIG[BRANCHNAME], "",
+      Cmd("git checkout -b %s" % TEST_CONFIG["BRANCHNAME"], "",
           cb=ResetVersion(4, 5)),
       Cmd("git branch -r",
           "svn/tags/3.4.2\nsvn/tags/3.2.1.0\nsvn/branches/3.4"),
       Cmd(("git log --format=%H --grep="
            "\"\\[Auto\\-roll\\] Bump up version to\""),
           "hash125\nhash118\nhash111\nhash101"),
       Cmd("git checkout -f hash125 -- %s" % VERSION_FILE, "",
           cb=ResetVersion(4, 4)),
       Cmd("git checkout -f HEAD -- %s" % VERSION_FILE, "",
           cb=ResetVersion(4, 5)),
       Cmd("git checkout -f hash118 -- %s" % VERSION_FILE, "",
           cb=ResetVersion(4, 3)),
       Cmd("git checkout -f HEAD -- %s" % VERSION_FILE, "",
           cb=ResetVersion(4, 5)),
       Cmd("git checkout -f hash111 -- %s" % VERSION_FILE, "",
           cb=ResetVersion(4, 2)),
       Cmd("git checkout -f HEAD -- %s" % VERSION_FILE, "",
           cb=ResetVersion(4, 5)),
       URL("https://v8-status.appspot.com/revisions?format=json",
           "[{\"revision\": \"126\", \"status\": true},"
            "{\"revision\": \"123\", \"status\": true},"
            "{\"revision\": \"112\", \"status\": true}]"),
       Cmd("git svn find-rev hash118", "118"),
       Cmd("git svn find-rev hash125", "125"),
       Cmd("git svn find-rev r123", "hash123"),
       Cmd("git log -1 --format=%at hash123", "1"),
       Cmd("git reset --hard hash123", ""),
       Cmd("git svn tag 3.4.3 -m \"Tagging version 3.4.3\"", ""),
       Cmd("git checkout -f some_branch", ""),
-      Cmd("git branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
+      Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
     ])
 
     AutoTag(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),
@@ skipping 42 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)