Refactoring: Unify all mocks in auto roll tests.

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 235 matching lines @@
     self.assertEquals("(Chromium issues 234, 1234567890"
                       ", 12345678901234567, "
                       "1234567890123456789)",
                       MakeChangeLogBugReference("BUG=234\n"
                                                 "BUG=12345678901234567\n"
                                                 "BUG=1234567890123456789\n"
                                                 "BUG=1234567890\n"))
 
 
 def Cmd(*args, **kwargs):
-  """Convenience function returning a git test expectation."""
+  """Convenience function returning a shell command test expectation."""
   return {
-    "name": "git",
+    "name": "command",
     "args": args,
     "ret": args[-1],
     "cb": kwargs.get("cb"),
   }
 
 
 def RL(text, cb=None):
   """Convenience function returning a readline test expectation."""
   return {"name": "readline", "args": [], "ret": text, "cb": cb}
 
 
 def URL(*args, **kwargs):
   """Convenience function returning a readurl test expectation."""
   return {
     "name": "readurl",
     "args": args[:-1],
     "ret": args[-1],
     "cb": kwargs.get("cb"),
   }
 
 
 class SimpleMock(object):
-  def __init__(self, name):
-    self._name = name
+  def __init__(self):
     self._recipe = []
     self._index = -1
 
   def Expect(self, recipe):
     self._recipe = recipe
 
-  def Call(self, *args):  # pragma: no cover
+  def Call(self, name, *args):  # pragma: no cover
     self._index += 1
     try:
       expected_call = self._recipe[self._index]
     except IndexError:
-      raise NoRetryException("Calling %s %s" % (self._name, " ".join(args)))
+      raise NoRetryException("Calling %s %s" % (name, " ".join(args)))
 
     if not isinstance(expected_call, dict):
-      raise NoRetryException("Found wrong expectation type for %s %s"
-                             % (self._name, " ".join(args)))
+      raise NoRetryException("Found wrong expectation type for %s %s" %
+                             (name, " ".join(args)))
 
+    if expected_call["name"] != name:
+      raise NoRetryException("Expected action: %s %s - Actual: %s" %
+          (expected_call["name"], expected_call["args"], name))
 
     # The number of arguments in the expectation must match the actual
     # arguments.
     if len(args) > len(expected_call['args']):
       raise NoRetryException("When calling %s with arguments, the "
           "expectations must consist of at least as many arguments." %
-          self._name)
+          name)
 
     # Compare expected and actual arguments.
     for (expected_arg, actual_arg) in zip(expected_call['args'], args):
       if expected_arg != actual_arg:
-        raise NoRetryException("Expected: %s - Actual: %s"
-                               % (expected_arg, actual_arg))
+        raise NoRetryException("Expected: %s - Actual: %s" %
+                               (expected_arg, actual_arg))
 
     # The expected call contains an optional callback for checking the context
     # at the time of the call.
     if expected_call['cb']:
       try:
         expected_call['cb']()
       except:
         tb = traceback.format_exc()
         raise NoRetryException("Caught exception from callback: %s" % tb)
 
     # If the return value is an exception, raise it instead of returning.
     if isinstance(expected_call['ret'], Exception):
       raise expected_call['ret']
     return expected_call['ret']
 
   def AssertFinished(self):  # pragma: no cover
     if self._index < len(self._recipe) -1:
-      raise NoRetryException("Called %s too seldom: %d vs. %d"
-                             % (self._name, self._index, len(self._recipe)))
+      raise NoRetryException("Called mock too seldom: %d vs. %d" %
+                             (self._index, len(self._recipe)))
 
 
 class ScriptTest(unittest.TestCase):
   def MakeEmptyTempFile(self):
     handle, name = tempfile.mkstemp()
     os.close(handle)
     self._tmp_files.append(name)
     return name
 
   def WriteFakeVersionFile(self, minor=22, build=4, patch=0):
@@ skipping 12 matching lines @@
     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):
     """Convenience wrapper."""
     args = args if args is not None else ["-m"]
     return script(TEST_CONFIG, self, self._state).RunSteps([step_class], args)
 
-  def CmdMock(self, cmd, args="", pipe=True):
-    print "%s %s" % (cmd, args)
-    return self._cmd_mock.Call(cmd + " " + 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):
-    return self.CmdMock(cmd, args)
+    print "%s %s" % (cmd, args)
+    return self._mock.Call("command", cmd + " " + args)
 
   def ReadLine(self):
-    return self._rl_mock.Call()
+    return self._mock.Call("readline")
 
   def ReadURL(self, url, params):
     if params is not None:
-      return self._url_mock.Call(url, params)
+      return self._mock.Call("readurl", url, params)
     else:
-      return self._url_mock.Call(url)
+      return self._mock.Call("readurl", url)
 
   def ReadClusterFuzzAPI(self, api_key, **params):
     # TODO(machenbach): Use a mock for this and add a test that stops rolling
     # due to clustefuzz results.
     return []
 
   def Sleep(self, seconds):
     pass
 
   def GetDate(self):
     return "1999-07-31"
 
   def GetUTCStamp(self):
     return "100000"
 
-  def ExpectCmd(self, *args):
+  def Expect(self, *args):
     """Convenience wrapper."""
-    self._cmd_mock.Expect(*args)
-
-  def ExpectReadline(self, *args):
-    """Convenience wrapper."""
-    self._rl_mock.Expect(*args)
-
-  def ExpectReadURL(self, *args):
-    """Convenience wrapper."""
-    self._url_mock.Expect(*args)
+    self._mock.Expect(*args)
 
   def setUp(self):
-    self._cmd_mock = SimpleMock("command")
-    self._rl_mock = SimpleMock("readline")
-    self._url_mock = SimpleMock("readurl")
+    self._mock = SimpleMock()
     self._tmp_files = []
     self._state = {}
 
   def tearDown(self):
     Command("rm", "-rf %s*" % TEST_CONFIG[PERSISTFILE_BASENAME])
 
     # Clean up temps. Doesn't work automatically.
     for name in self._tmp_files:
       if os.path.exists(name):
         os.remove(name)
 
-    self._cmd_mock.AssertFinished()
-    self._rl_mock.AssertFinished()
-    self._url_mock.AssertFinished()
+    self._mock.AssertFinished()
 
   def testGitOrig(self):
     self.assertTrue(Command("git", "--version").startswith("git version"))
 
   def testGitMock(self):
-    self.ExpectCmd([Cmd("git --version", "git version 1.2.3"),
-                    Cmd("git dummy", "")])
+    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.ExpectCmd([
+    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]),
+      RL("Y"),
       Cmd("git branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
     ])
-    self.ExpectReadline([RL("Y")])
     self.MakeStep().CommonPrepare()
     self.MakeStep().PrepareBranch()
     self.assertEquals("some_branch", self._state["current_branch"])
 
   def testCommonPrepareNoConfirm(self):
-    self.ExpectCmd([
+    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]),
+      RL("n"),
     ])
-    self.ExpectReadline([RL("n")])
     self.MakeStep().CommonPrepare()
     self.assertRaises(Exception, self.MakeStep().PrepareBranch)
     self.assertEquals("some_branch", self._state["current_branch"])
 
   def testCommonPrepareDeleteBranchFailure(self):
-    self.ExpectCmd([
+    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]),
+      RL("Y"),
       Cmd("git branch -D %s" % TEST_CONFIG[BRANCHNAME], None),
     ])
-    self.ExpectReadline([RL("Y")])
     self.MakeStep().CommonPrepare()
     self.assertRaises(Exception, self.MakeStep().PrepareBranch)
     self.assertEquals("some_branch", self._state["current_branch"])
 
   def testInitialEnvironmentChecks(self):
     TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
     os.environ["EDITOR"] = "vi"
     self.MakeStep().InitialEnvironmentChecks()
 
   def testReadAndPersistVersion(self):
@@ skipping 22 matching lines @@
                      "        too much\n"
                      "        trailing", cl)
 
     self.assertEqual("//\n#define BUILD_NUMBER  3\n",
                      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.ExpectCmd([
+    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):
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
     self.WriteFakeVersionFile()
     TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
 
-    self.ExpectCmd([
+    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"),
     ])
 
-    # The cl for rev4 on rietveld has an updated LOG flag.
-    self.ExpectReadURL([
-      URL("https://codereview.chromium.org/9876543210/description",
-          "Title\n\nBUG=456\nLOG=N\n\n"),
-    ])
-
     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])
 
     expected_cl = """1999-07-31: Version 3.22.5
 
         Title text 1.
@@ skipping 19 matching lines @@
 #       (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])
     os.environ["EDITOR"] = "vi"
-    self.ExpectCmd([
+    self.Expect([
+      RL(""),  # Open editor.
       Cmd("vi %s" % TEST_CONFIG[CHANGELOG_ENTRY_FILE], ""),
     ])
-    self.ExpectReadline([
-      RL(""),  # Open editor.
-    ])
 
     self.RunStep(PushToTrunk, EditChangeLog)
 
     self.assertEquals("New\n        Lines",
                       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):
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
     self.WriteFakeVersionFile()
     self._state["last_push_trunk"] = "hash1"
     self._state["latest_build"] = "6"
     self._state["latest_version"] = "3.22.6.0"
 
-    self.ExpectCmd([
+    self.Expect([
       Cmd("git checkout -f hash1 -- %s" % TEST_CONFIG[VERSION_FILE], ""),
       Cmd(("git checkout -f svn/bleeding_edge -- %s" %
            TEST_CONFIG[VERSION_FILE]),
           "", cb=lambda: self.WriteFakeVersionFile(22, 6)),
-    ])
-
-    self.ExpectReadline([
       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:
       f.write(change_log)
 
-    self.ExpectCmd([
+    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)
 
@@ skipping 96 matching lines @@
       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 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 -- %s" %
            TEST_CONFIG[VERSION_FILE]),
           "", cb=self.WriteFakeVersionFile),
       Cmd("git checkout -f hash2 -- %s" % TEST_CONFIG[VERSION_FILE], "",
           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 += [
       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], "",
           cb=ResetToTrunk),
       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 -- %s" % TEST_CONFIG[VERSION_FILE], "",
           cb=self.WriteFakeVersionFile),
       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], ""),
     ]
-    self.ExpectCmd(expectations)
-
-    # Expected keyboard input in manual mode:
-    if manual:
-      self.ExpectReadline([
-        RL("Y"),  # Confirm last push.
-        RL(""),  # Open editor.
-        RL("Y"),  # Increment build number.
-        RL("Y"),  # Sanity check.
-      ])
-
-    # Expected keyboard input in semi-automatic mode and forced mode:
-    if not manual:
-      self.ExpectReadline([])
+    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])
     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))
@@ skipping 27 matching lines @@
     if not os.path.exists(os.path.join(TEST_CONFIG[CHROMIUM], "v8")):
       os.makedirs(os.path.join(TEST_CONFIG[CHROMIUM], "v8"))
     TextToFile("Some line\n   \"v8_revision\": \"123444\",\n  some line",
                TEST_CONFIG[DEPS_FILE])
     def WriteDeps():
       TextToFile("Some line\n   \"v8_revision\": \"123455\",\n  some line",
                  TEST_CONFIG[DEPS_FILE])
 
     os.environ["EDITOR"] = "vi"
     force_flag = " -f" if not manual else ""
-    self.ExpectCmd([
+    expectations = [
       Cmd("git status -s -uno", ""),
       Cmd("git status -s -b -uno", "## some_branch\n"),
       Cmd("git svn fetch", ""),
       Cmd(("git log -1 --format=%H --grep="
            "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" "
            "svn/trunk"), "push_hash\n"),
       Cmd("git svn find-rev push_hash", "123455\n"),
       Cmd("git log -1 --format=%s push_hash",
           "Version 3.22.5 (based on bleeding_edge revision r123454)\n"),
+      URL("https://chromium-build.appspot.com/p/chromium/sheriff_v8.js",
+          "document.write('g_name')"),
       Cmd("git status -s -uno", ""),
       Cmd("git checkout -f master", ""),
       Cmd("gclient sync --nohooks", "syncing..."),
       Cmd("git pull", ""),
       Cmd("git fetch origin", ""),
       Cmd("git checkout -b v8-roll-123455", ""),
       Cmd("roll-dep v8 123455", "rolled", cb=WriteDeps),
+    ]
+    if manual:
+      expectations.append(RL("c_name@chromium.org"))  # Chromium reviewer.
+    expectations += [
       Cmd(("git commit -am \"Update V8 to version 3.22.5 "
            "(based on bleeding_edge revision r123454).\n\n"
            "Please reply to the V8 sheriff c_name@chromium.org in "
            "case of problems.\n\nTBR=c_name@chromium.org\""),
           ""),
       Cmd(("git cl upload --send-mail --email \"author@chromium.org\"%s"
            % force_flag), ""),
-    ])
-
-    self.ExpectReadURL([
-      URL("https://chromium-build.appspot.com/p/chromium/sheriff_v8.js",
-          "document.write('g_name')"),
-    ])
-
-    # Expected keyboard input in manual mode:
-    if manual:
-      self.ExpectReadline([
-        RL("c_name@chromium.org"),  # Chromium reviewer.
-      ])
-
-    # Expected keyboard input in semi-automatic mode and forced mode:
-    if not manual:
-      self.ExpectReadline([])
+    ]
+    self.Expect(expectations)
 
     args = ["-a", "author@chromium.org", "-c", TEST_CONFIG[CHROMIUM],
             "--sheriff", "--googlers-mapping", googlers_mapping_py]
     if force: args.append("-f")
     if manual: args.append("-m")
     else: args += ["-r", "reviewer@chromium.org"]
     ChromiumRoll(TEST_CONFIG, self).Run(args)
 
     deps = FileToText(TEST_CONFIG[DEPS_FILE])
     self.assertTrue(re.search("\"v8_revision\": \"123455\"", deps))
 
   def testChromiumRollManual(self):
     self._ChromiumRoll(manual=True)
 
   def testChromiumRollSemiAutomatic(self):
     self._ChromiumRoll()
 
   def testChromiumRollForced(self):
     self._ChromiumRoll(force=True)
 
   def testCheckLastPushRecently(self):
-    self.ExpectCmd([
+    self.Expect([
       Cmd(("git log -1 --format=%H --grep="
            "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" "
            "svn/trunk"), "hash2\n"),
       Cmd("git log -1 --format=%s hash2",
           "Version 3.4.5 (based on bleeding_edge revision r99)\n"),
     ])
 
     self._state["lkgr"] = "101"
 
     self.assertRaises(Exception, lambda: self.RunStep(auto_push.AutoPush,
                                                       CheckLastPush,
                                                       AUTO_PUSH_ARGS))
 
   def testAutoPush(self):
     TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
     TEST_CONFIG[SETTINGS_LOCATION] = "~/.doesnotexist"
 
-    self.ExpectReadURL([
+    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"),
-    ])
-
-    self.ExpectCmd([
-      Cmd("git status -s -uno", ""),
-      Cmd("git status -s -b -uno", "## some_branch\n"),
-      Cmd("git svn fetch", ""),
       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]))
 
     self.assertEquals("100", state["lkgr"])
 
   def testAutoPushStoppedBySettings(self):
     TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
     TEST_CONFIG[SETTINGS_LOCATION] = self.MakeEmptyTempFile()
     TextToFile("{\"enable_auto_push\": false}", TEST_CONFIG[SETTINGS_LOCATION])
 
-    self.ExpectReadURL([])
-
-    self.ExpectCmd([
+    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):
     TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
     TEST_CONFIG[SETTINGS_LOCATION] = "~/.doesnotexist"
 
-    self.ExpectReadURL([
+    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)\"}"),
     ])
 
-    self.ExpectCmd([
-      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 testAutoRollExistingRoll(self):
-    self.ExpectReadURL([
+    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]])
     self.assertEquals(1, result)
 
   # Snippet from the original DEPS file.
   FAKE_DEPS = """
 vars = {
   "v8_revision": "123455",
 }
 deps = {
   "src/v8":
     (Var("googlecode_url") % "v8") + "/" + Var("v8_branch") + "@" +
     Var("v8_revision"),
 }
 """
 
   def testAutoRollUpToDate(self):
-    self.ExpectReadURL([
+    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:]]*\" "
+           "svn/trunk"), "push_hash\n"),
+      Cmd("git svn find-rev push_hash", "123455\n"),
       URL("http://src.chromium.org/svn/trunk/src/DEPS",
           self.FAKE_DEPS),
     ])
 
-    self.ExpectCmd([
-      Cmd(("git log -1 --format=%H --grep="
-           "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" "
-           "svn/trunk"), "push_hash\n"),
-      Cmd("git svn find-rev push_hash", "123455\n"),
-    ])
-
     result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
         AUTO_PUSH_ARGS + ["-c", TEST_CONFIG[CHROMIUM]])
     self.assertEquals(1, result)
 
   def testAutoRoll(self):
     TEST_CONFIG[CLUSTERFUZZ_API_KEY_FILE]  = self.MakeEmptyTempFile()
     TextToFile("fake key", TEST_CONFIG[CLUSTERFUZZ_API_KEY_FILE])
-    self.ExpectReadURL([
+
+    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:]]*\" "
+           "svn/trunk"), "push_hash\n"),
+      Cmd("git svn find-rev push_hash", "123456\n"),
       URL("http://src.chromium.org/svn/trunk/src/DEPS",
           self.FAKE_DEPS),
     ])
 
-    self.ExpectCmd([
-      Cmd(("git log -1 --format=%H --grep="
-           "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" "
-           "svn/trunk"), "push_hash\n"),
-      Cmd("git svn find-rev push_hash", "123456\n"),
-    ])
-
     result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
         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[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
     self.WriteFakeVersionFile(build=5)
     os.environ["EDITOR"] = "vi"
@@ skipping 21 matching lines @@
 
     def VerifySVNCommit():
       commit = FileToText(TEST_CONFIG[COMMITMSG_FILE])
       self.assertEquals(msg, commit)
       version = FileToText(TEST_CONFIG[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.ExpectCmd([
+    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 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"),
           ""),
       Cmd(("git log --format=%H --grep=\"Port r34567\" "
            "--reverse svn/bleeding_edge"),
           "hash3"),
       Cmd("git svn find-rev hash3 svn/bleeding_edge", "56789"),
       Cmd("git log -1 --format=%s hash3", "Title3"),
+      RL("Y"),  # Automatically add corresponding ports (34567, 56789)?
       Cmd("git svn find-rev r12345 svn/bleeding_edge", "hash4"),
       # Simulate svn being down which stops the script.
       Cmd("git svn find-rev r23456 svn/bleeding_edge", None),
       # Restart script in the failing step.
       Cmd("git svn find-rev r12345 svn/bleeding_edge", "hash4"),
       Cmd("git svn find-rev r23456 svn/bleeding_edge", "hash2"),
       Cmd("git svn find-rev r34567 svn/bleeding_edge", "hash3"),
       Cmd("git svn find-rev r45678 svn/bleeding_edge", "hash1"),
       Cmd("git svn find-rev r56789 svn/bleeding_edge", "hash5"),
       Cmd("git log -1 --format=%s hash4", "Title4"),
@@ skipping 20 matching lines @@
           "", cb=VerifyPatch("patch3")),
       Cmd("git log -1 -p hash1", "patch1"),
       Cmd(("git apply --index --reject \"%s\"" %
            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]),
           "", 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], ""),
+      RL("reviewer@chromium.org"),  # V8 reviewer.
       Cmd("git cl upload --send-mail -r \"reviewer@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 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], ""),
     ])
 
-    self.ExpectReadline([
-      RL("Y"),  # Automatically add corresponding ports (34567, 56789)?
-      RL("Y"),  # Automatically increment patch level?
-      RL("reviewer@chromium.org"),  # V8 reviewer.
-      RL("LGTM"),  # Enter LGTM for V8 CL.
-    ])
-
     # 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))
 
     # Test that state recovery after restarting the script works.
@@ skipping 69 matching lines @@
     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.ExpectCmd([
+    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 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^", TEST_CONFIG[VERSION_FILE]),
@@ skipping 111 matching lines @@
 
   def testBumpUpVersion(self):
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
     self.WriteFakeVersionFile()
 
     def ResetVersion(minor, build, patch=0):
       return lambda: self.WriteFakeVersionFile(minor=minor,
                                                build=build,
                                                patch=patch)
 
-    self.ExpectCmd([
+    self.Expect([
       Cmd("git status -s -uno", ""),
       Cmd("git checkout -f bleeding_edge", "", cb=ResetVersion(11, 4)),
       Cmd("git pull", ""),
       Cmd("git branch", ""),
       Cmd("git checkout -f bleeding_edge", ""),
       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 bleeding_edge", ""),
       Cmd(("git log --format=%H --grep="
            "\"^git-svn-id: [^@]*@12345 [A-Za-z0-9-]*$\""),
           "lkgr_hash"),
       Cmd("git checkout -b auto-bump-up-version lkgr_hash", ""),
       Cmd("git checkout -f bleeding_edge", ""),
       Cmd("git branch", ""),
       Cmd("git diff --name-only lkgr_hash lkgr_hash^", ""),
       Cmd("git checkout -f master", "", cb=ResetVersion(11, 5)),
       Cmd("git pull", ""),
+      URL("https://v8-status.appspot.com/current?format=json",
+          "{\"message\": \"Tree is open\"}"),
       Cmd("git checkout -b auto-bump-up-version bleeding_edge", "",
           cb=ResetVersion(11, 4)),
       Cmd("git commit -am \"[Auto-roll] Bump up version to 3.11.6.0\n\n"
           "TBR=author@chromium.org\"", ""),
       Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f "
           "--bypass-hooks", ""),
       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.ExpectReadURL([
-      URL("https://v8-status.appspot.com/lkgr", "12345"),
-      URL("https://v8-status.appspot.com/current?format=json",
-          "{\"message\": \"Tree is open\"}"),
-    ])
-
     BumpUpVersion(TEST_CONFIG, self).Run(["-a", "author@chromium.org"])
 
   def testAutoTag(self):
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
     self.WriteFakeVersionFile()
 
     def ResetVersion(minor, build, patch=0):
       return lambda: self.WriteFakeVersionFile(minor=minor,
                                                build=build,
                                                patch=patch)
 
-    self.ExpectCmd([
+    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], "",
           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" % TEST_CONFIG[VERSION_FILE], "",
           cb=ResetVersion(4, 4)),
       Cmd("git checkout -f HEAD -- %s" % TEST_CONFIG[VERSION_FILE], "",
           cb=ResetVersion(4, 5)),
       Cmd("git checkout -f hash118 -- %s" % TEST_CONFIG[VERSION_FILE], "",
           cb=ResetVersion(4, 3)),
       Cmd("git checkout -f HEAD -- %s" % TEST_CONFIG[VERSION_FILE], "",
           cb=ResetVersion(4, 5)),
       Cmd("git checkout -f hash111 -- %s" % TEST_CONFIG[VERSION_FILE], "",
           cb=ResetVersion(4, 2)),
       Cmd("git checkout -f HEAD -- %s" % TEST_CONFIG[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], ""),
     ])
 
-    self.ExpectReadURL([
-      URL("https://v8-status.appspot.com/revisions?format=json",
-          "[{\"revision\": \"126\", \"status\": true},"
-           "{\"revision\": \"123\", \"status\": true},"
-           "{\"revision\": \"112\", \"status\": true}]"),
-    ])
-
     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):
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
     self._state["latest"] = "latest_hash"
 
-    self.ExpectCmd([
+    self.Expect([
       Cmd("git diff --name-only latest_hash latest_hash^",
           TEST_CONFIG[VERSION_FILE]),
     ])
 
     self.assertEquals(1,
         self.RunStep(BumpUpVersion, LastChangeBailout, ["--dry_run"]))
 
   # Test that we bail out if the lkgr was a version change.
   def testBumpUpVersionBailout2(self):
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
     self._state["lkgr"] = "lkgr_hash"
 
-    self.ExpectCmd([
+    self.Expect([
       Cmd("git diff --name-only lkgr_hash lkgr_hash^",
           TEST_CONFIG[VERSION_FILE]),
     ])
 
     self.assertEquals(1,
         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):
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
     self._state["lkgr"] = "lkgr_hash"
     self._state["lkgr_version"] = "3.22.4.0"
     self._state["latest_version"] = "3.22.5.0"
 
-    self.ExpectCmd([
+    self.Expect([
       Cmd("git diff --name-only lkgr_hash lkgr_hash^", ""),
     ])
 
     self.assertEquals(1,
         self.RunStep(BumpUpVersion, LKGRVersionUpToDateBailout, ["--dry_run"]))
 
 
 class SystemTest(unittest.TestCase):
   def testReload(self):
     step = MakeStep(step_class=PrepareChangeLog, number=0, state={}, config={},
                     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)