[v8-dev] [v8] r23611 committed - Refactoring: Unify command mocks in v8 roll tests....

codesite-noreply via v8-dev Tue, 02 Sep 2014 05:52:29 -0700

Revision: 23611
Author:   [email protected]
Date:     Tue Sep  2 12:51:30 2014 UTC
Log:      Refactoring: Unify command mocks in v8 roll tests.


This unifies all mocks for shell commands (like git, svn,
gclient). The command name is now explicitly stated in the
test expectations, which allows to correctly test the few
commands that are not git.

TEST=./script_test.py
[email protected]

Review URL: https://codereview.chromium.org/528973002
https://code.google.com/p/v8/source/detail?r=23611

Modified:
 /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py

=======================================

--- /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Wed Aug 2713:13:40 2014 UTC+++ /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Tue Sep 212:51:30 2014 UTC

@@ -252,11 +252,11 @@
                                                 "BUG=1234567890\n"))


-def Git(*args, **kwargs):
+def Cmd(*args, **kwargs):
   """Convenience function returning a git test expectation."""
   return {
     "name": "git",
-    "args": args[:-1],
+    "args": args,
     "ret": args[-1],
     "cb": kwargs.get("cb"),
   }
@@ -286,23 +286,24 @@
   def Expect(self, recipe):
     self._recipe = recipe

-  def Call(self, name, *args):  # pragma: no cover
+  def Call(self, *args):  # pragma: no cover
     self._index += 1
     try:
       expected_call = self._recipe[self._index]
     except IndexError:
-      raise NoRetryException("Calling %s %s" % (name, " ".join(args)))

+ raise NoRetryException("Calling %s %s" %(self._name, " ".join(args)))


     if not isinstance(expected_call, dict):
       raise NoRetryException("Found wrong expectation type for %s %s"
-                             % (name, " ".join(args)))
+                             % (self._name, " ".join(args)))


     # 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." %name)

+          "expectations must consist of at least as many arguments." %
+          self._name)

     # Compare expected and actual arguments.
     for (expected_arg, actual_arg) in zip(expected_call['args'], args):
@@ -360,21 +361,18 @@
     args = args if args is not None else ["-m"]

return script(TEST_CONFIG, self, self._state).RunSteps([step_class],args)


-  def GitMock(self, cmd, args="", pipe=True):
+  def CmdMock(self, cmd, args="", pipe=True):
     print "%s %s" % (cmd, args)
-    return self._git_mock.Call("git", args)
+    return self._cmd_mock.Call(cmd + " " + args)

   def LogMock(self, cmd, args=""):
     print "Log: %s %s" % (cmd, args)

   MOCKS = {

- "gclient": GitMock, # TODO(machenbach): Yet another hack. Unify allmocks.

-    "git": GitMock,

- "roll-dep": GitMock, # TODO(machenbach): Yet another hack. Unify allmocks.- # TODO(machenbach): Little hack to reuse the git mock for the one svncall

-    # in merge-to-branch. The command should be made explicit in the test
-    # expectations.
-    "svn": GitMock,
+    "gclient": CmdMock,
+    "git": CmdMock,
+    "roll-dep": CmdMock,
+    "svn": CmdMock,
     "vi": LogMock,
   }

@@ -385,13 +383,13 @@
     return ScriptTest.MOCKS[cmd](self, cmd, args)

   def ReadLine(self):
-    return self._rl_mock.Call("readline")
+    return self._rl_mock.Call()

   def ReadURL(self, url, params):
     if params is not None:
-      return self._url_mock.Call("readurl", url, params)
+      return self._url_mock.Call(url, params)
     else:
-      return self._url_mock.Call("readurl", url)
+      return self._url_mock.Call(url)

   def ReadClusterFuzzAPI(self, api_key, **params):

# TODO(machenbach): Use a mock for this and add a test that stopsrolling

@@ -407,9 +405,9 @@
   def GetUTCStamp(self):
     return "100000"

-  def ExpectGit(self, *args):
+  def ExpectCmd(self, *args):
     """Convenience wrapper."""
-    self._git_mock.Expect(*args)
+    self._cmd_mock.Expect(*args)

   def ExpectReadline(self, *args):
     """Convenience wrapper."""
@@ -420,7 +418,7 @@
     self._url_mock.Expect(*args)

   def setUp(self):
-    self._git_mock = SimpleMock("git")
+    self._cmd_mock = SimpleMock("command")
     self._rl_mock = SimpleMock("readline")
     self._url_mock = SimpleMock("readurl")
     self._tmp_files = []
@@ -434,7 +432,7 @@
       if os.path.exists(name):
         os.remove(name)

-    self._git_mock.AssertFinished()
+    self._cmd_mock.AssertFinished()
     self._rl_mock.AssertFinished()
     self._url_mock.AssertFinished()

@@ -442,17 +440,18 @@
     self.assertTrue(Command("git", "--version").startswith("git version"))

   def testGitMock(self):

- self.ExpectGit([Git("--version", "git version 1.2.3"),Git("dummy", "")])

+    self.ExpectCmd([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.ExpectGit([
-      Git("status -s -uno", ""),
-      Git("status -s -b -uno", "## some_branch"),
-      Git("svn fetch", ""),
-      Git("branch", "  branch1\n* %s" % TEST_CONFIG[BRANCHNAME]),
-      Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
+    self.ExpectCmd([
+      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 -D %s" % TEST_CONFIG[BRANCHNAME], ""),
     ])
     self.ExpectReadline([RL("Y")])
     self.MakeStep().CommonPrepare()
@@ -460,11 +459,11 @@
     self.assertEquals("some_branch", self._state["current_branch"])

   def testCommonPrepareNoConfirm(self):
-    self.ExpectGit([
-      Git("status -s -uno", ""),
-      Git("status -s -b -uno", "## some_branch"),
-      Git("svn fetch", ""),
-      Git("branch", "  branch1\n* %s" % TEST_CONFIG[BRANCHNAME]),
+    self.ExpectCmd([
+      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]),
     ])
     self.ExpectReadline([RL("n")])
     self.MakeStep().CommonPrepare()
@@ -472,12 +471,12 @@
     self.assertEquals("some_branch", self._state["current_branch"])

   def testCommonPrepareDeleteBranchFailure(self):
-    self.ExpectGit([
-      Git("status -s -uno", ""),
-      Git("status -s -b -uno", "## some_branch"),
-      Git("svn fetch", ""),
-      Git("branch", "  branch1\n* %s" % TEST_CONFIG[BRANCHNAME]),
-      Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], None),
+    self.ExpectCmd([
+      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 -D %s" % TEST_CONFIG[BRANCHNAME], None),
     ])
     self.ExpectReadline([RL("Y")])
     self.MakeStep().CommonPrepare()
@@ -522,8 +521,8 @@

   def testPreparePushRevision(self):

# Tests the default push hash used when the --revision option is notset.

-    self.ExpectGit([
-      Git("log -1 --format=%H HEAD", "push_hash")
+    self.ExpectCmd([
+      Cmd("git log -1 --format=%H HEAD", "push_hash")
     ])

     self.RunStep(PushToTrunk, PreparePushRevision)
@@ -534,22 +533,22 @@
     self.WriteFakeVersionFile()
     TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()

-    self.ExpectGit([
-      Git("log --format=%H 1234..push_hash", "rev1\nrev2\nrev3\nrev4"),
-      Git("log -1 --format=%s rev1", "Title text 1"),
-      Git("log -1 --format=%B rev1", "Title\n\nBUG=\nLOG=y\n"),
-      Git("log -1 --format=%an rev1", "[email protected]"),
-      Git("log -1 --format=%s rev2", "Title text 2."),
-      Git("log -1 --format=%B rev2", "Title\n\nBUG=123\nLOG= \n"),
-      Git("log -1 --format=%an rev2", "[email protected]"),
-      Git("log -1 --format=%s rev3", "Title text 3"),
-      Git("log -1 --format=%B rev3", "Title\n\nBUG=321\nLOG=true\n"),
-      Git("log -1 --format=%an rev3", "[email protected]"),
-      Git("log -1 --format=%s rev4", "Title text 4"),
-      Git("log -1 --format=%B rev4",
+    self.ExpectCmd([
+      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", "[email protected]"),
+      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", "[email protected]"),
+      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", "[email protected]"),
+      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";)),
-      Git("log -1 --format=%an rev4", "[email protected]"),
+      Cmd("git log -1 --format=%an rev4", "[email protected]"),
     ])

     # The cl for rev4 on rietveld has an updated LOG flag.
@@ -616,9 +615,10 @@
     self._state["latest_build"] = "6"
     self._state["latest_version"] = "3.22.6.0"

-    self.ExpectGit([
-      Git("checkout -f hash1 -- %s" % TEST_CONFIG[VERSION_FILE], ""),

- Git("checkout -f svn/bleeding_edge -- %s" %TEST_CONFIG[VERSION_FILE],

+    self.ExpectCmd([
+      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)),
     ])

@@ -638,9 +638,9 @@
     with open(TEST_CONFIG[CHANGELOG_ENTRY_FILE], "w") as f:
       f.write(change_log)

-    self.ExpectGit([
-      Git("diff svn/trunk hash1", "patch content"),
-      Git("svn find-rev hash1", "123455\n"),
+    self.ExpectCmd([
+      Cmd("git diff svn/trunk hash1", "patch content"),
+      Cmd("git svn find-rev hash1", "123455\n"),
     ])

     self._state["push_hash"] = "hash1"
@@ -742,47 +742,50 @@
           change_log)

     force_flag = " -f" if not manual else ""
-    self.ExpectGit([
-      Git("status -s -uno", ""),
-      Git("status -s -b -uno", "## some_branch\n"),
-      Git("svn fetch", ""),
-      Git("branch", "  branch1\n* branch2\n"),
-      Git("branch", "  branch1\n* branch2\n"),

- Git("checkout -b %s svn/bleeding_edge" %TEST_CONFIG[BRANCHNAME], ""),

-      Git("svn find-rev r123455", "push_hash\n"),
-      Git(("log -1 --format=%H --grep="
+    self.ExpectCmd([
+      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 svn find-rev r123455", "push_hash\n"),
+      Cmd(("git log -1 --format=%H --grep="
            "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" "
            "svn/trunk"), "hash2\n"),
-      Git("log -1 hash2", "Log message\n"),
-      Git("log -1 --format=%s hash2",
+      Cmd("git log -1 hash2", "Log message\n"),
+      Cmd("git log -1 --format=%s hash2",
        "Version 3.4.5 (based on bleeding_edge revision r1234)\n"),
-      Git("svn find-rev r1234", "hash3\n"),

- Git("checkout -f svn/bleeding_edge -- %s" %TEST_CONFIG[VERSION_FILE],

+      Cmd("git svn find-rev r1234", "hash3\n"),
+      Cmd(("git checkout -f svn/bleeding_edge -- %s" %
+           TEST_CONFIG[VERSION_FILE]),
           "", cb=self.WriteFakeVersionFile),
-      Git("checkout -f hash2 -- %s" % TEST_CONFIG[VERSION_FILE], "",
+      Cmd("git checkout -f hash2 -- %s" % TEST_CONFIG[VERSION_FILE], "",
           cb=self.WriteFakeVersionFile),
-      Git("log --format=%H hash3..push_hash", "rev1\n"),
-      Git("log -1 --format=%s rev1", "Log text 1.\n"),
-      Git("log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"),
-      Git("log -1 --format=%an rev1", "[email protected]\n"),
-      Git("svn fetch", "fetch result\n"),
-      Git("checkout -f svn/bleeding_edge", ""),
-      Git("diff svn/trunk push_hash", "patch content\n"),
-      Git("svn find-rev push_hash", "123455\n"),
-      Git("checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], "",
+      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=%Brev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"),

+      Cmd("git log -1 --format=%an rev1", "[email protected]\n"),
+      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),
-      Git("apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""),
-      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),
-      Git("checkout -f svn/trunk -- %s" % TEST_CONFIG[VERSION_FILE], "",

+ Cmd("git checkout -f svn/trunk -- %s" %TEST_CONFIG[VERSION_FILE], "",

           cb=self.WriteFakeVersionFile),
-      Git("commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "",
+      Cmd("git commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "",
           cb=CheckSVNCommit),

- Git("svn dcommit 2>&1", "Some output\nCommitted r123456\nSomeoutput\n"),

-      Git("svn tag 3.22.5 -m \"Tagging version 3.22.5\"", ""),
-      Git("checkout -f some_branch", ""),
-      Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
-      Git("branch -D %s" % TEST_CONFIG[TRUNKBRANCH], ""),
+      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], ""),
     ])

     # Expected keyboard input in manual mode:
@@ -844,28 +847,28 @@

     os.environ["EDITOR"] = "vi"
     force_flag = " -f" if not manual else ""
-    self.ExpectGit([
-      Git("status -s -uno", ""),
-      Git("status -s -b -uno", "## some_branch\n"),
-      Git("svn fetch", ""),
-      Git(("log -1 --format=%H --grep="
+    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:]]*\" "
            "svn/trunk"), "push_hash\n"),
-      Git("svn find-rev push_hash", "123455\n"),
-      Git("log -1 --format=%s push_hash",
+      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"),
-      Git("status -s -uno", ""),
-      Git("checkout -f master", ""),
-      Git("sync --nohooks", "syncing..."),
-      Git("fetch origin", ""),
-      Git("checkout -b v8-roll-123455", ""),
-      Git("v8 123455", "rolled", cb=WriteDeps),
-      Git(("commit -am \"Update V8 to version 3.22.5 "
+      Cmd("git status -s -uno", ""),
+      Cmd("git checkout -f master", ""),
+      Cmd("gclient sync --nohooks", "syncing..."),
+      Cmd("git fetch origin", ""),
+      Cmd("git checkout -b v8-roll-123455", ""),
+      Cmd("roll-dep v8 123455", "rolled", cb=WriteDeps),
+      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 [email protected] in "
            "case of problems.\n\[email protected]\""),
           ""),
-      Git(("cl upload --send-mail --email \"[email protected]\"%s"
+      Cmd(("git cl upload --send-mail --email \"[email protected]\"%s"
            % force_flag), ""),
     ])

@@ -904,11 +907,11 @@
     self._ChromiumRoll(force=True)

   def testCheckLastPushRecently(self):
-    self.ExpectGit([
-      Git(("log -1 --format=%H --grep="
+    self.ExpectCmd([
+      Cmd(("git log -1 --format=%H --grep="
            "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" "
            "svn/trunk"), "hash2\n"),
-      Git("log -1 --format=%s hash2",
+      Cmd("git log -1 --format=%s hash2",
           "Version 3.4.5 (based on bleeding_edge revision r99)\n"),
     ])

@@ -929,14 +932,14 @@
       URL("https://v8-status.appspot.com/lkgr";, "100"),
     ])

-    self.ExpectGit([
-      Git("status -s -uno", ""),
-      Git("status -s -b -uno", "## some_branch\n"),
-      Git("svn fetch", ""),
-      Git(("log -1 --format=%H --grep=\""
+    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"),
-      Git("log -1 --format=%s push_hash",
+      Cmd("git log -1 --format=%s push_hash",
           "Version 3.4.5 (based on bleeding_edge revision r79)\n"),
     ])

@@ -954,10 +957,10 @@

     self.ExpectReadURL([])

-    self.ExpectGit([
-      Git("status -s -uno", ""),
-      Git("status -s -b -uno", "## some_branch\n"),
-      Git("svn fetch", ""),
+    self.ExpectCmd([
+      Cmd("git status -s -uno", ""),
+      Cmd("git status -s -b -uno", "## some_branch\n"),
+      Cmd("git svn fetch", ""),
     ])

     def RunAutoPush():
@@ -973,10 +976,10 @@
           "{\"message\": \"Tree is throttled (no push)\"}"),
     ])

-    self.ExpectGit([
-      Git("status -s -uno", ""),
-      Git("status -s -b -uno", "## some_branch\n"),
-      Git("svn fetch", ""),
+    self.ExpectCmd([
+      Cmd("git status -s -uno", ""),
+      Cmd("git status -s -b -uno", "## some_branch\n"),
+      Cmd("git svn fetch", ""),
     ])

     def RunAutoPush():
@@ -1016,11 +1019,11 @@
           self.FAKE_DEPS),
     ])

-    self.ExpectGit([
-      Git(("log -1 --format=%H --grep="
+    self.ExpectCmd([
+      Cmd(("git log -1 --format=%H --grep="
            "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" "
            "svn/trunk"), "push_hash\n"),
-      Git("svn find-rev push_hash", "123455\n"),
+      Cmd("git svn find-rev push_hash", "123455\n"),
     ])

     result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
@@ -1038,11 +1041,11 @@
           self.FAKE_DEPS),
     ])

-    self.ExpectGit([
-      Git(("log -1 --format=%H --grep="
+    self.ExpectCmd([
+      Cmd(("git log -1 --format=%H --grep="
            "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" "
            "svn/trunk"), "push_hash\n"),
-      Git("svn find-rev push_hash", "123456\n"),
+      Cmd("git svn find-rev push_hash", "123456\n"),
     ])

     result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
@@ -1086,73 +1089,82 @@
       self.assertTrue(re.search(r"#define PATCH_LEVEL\s+1", version))

self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0",version))


-    self.ExpectGit([
-      Git("status -s -uno", ""),
-      Git("status -s -b -uno", "## some_branch\n"),
-      Git("svn fetch", ""),
-      Git("branch", "  branch1\n* branch2\n"),
-      Git("checkout -b %s svn/trunk" % TEST_CONFIG[BRANCHNAME], ""),

- Git("log --format=%H --grep=\"Port r12345\" --reversesvn/bleeding_edge",

+    self.ExpectCmd([
+      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"),
-      Git("svn find-rev hash1 svn/bleeding_edge", "45678"),
-      Git("log -1 --format=%s hash1", "Title1"),
-      Git("svn find-rev hash2 svn/bleeding_edge", "23456"),
-      Git("log -1 --format=%s hash2", "Title2"),

- Git("log --format=%H --grep=\"Port r23456\" --reversesvn/bleeding_edge",

+      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"),
           ""),

- Git("log --format=%H --grep=\"Port r34567\" --reversesvn/bleeding_edge",

+      Cmd(("git log --format=%H --grep=\"Port r34567\" "
+           "--reverse svn/bleeding_edge"),
           "hash3"),
-      Git("svn find-rev hash3 svn/bleeding_edge", "56789"),
-      Git("log -1 --format=%s hash3", "Title3"),
-      Git("svn find-rev r12345 svn/bleeding_edge", "hash4"),
+      Cmd("git svn find-rev hash3 svn/bleeding_edge", "56789"),
+      Cmd("git log -1 --format=%s hash3", "Title3"),
+      Cmd("git svn find-rev r12345 svn/bleeding_edge", "hash4"),
       # Simulate svn being down which stops the script.
-      Git("svn find-rev r23456 svn/bleeding_edge", None),
+      Cmd("git svn find-rev r23456 svn/bleeding_edge", None),
       # Restart script in the failing step.
-      Git("svn find-rev r12345 svn/bleeding_edge", "hash4"),
-      Git("svn find-rev r23456 svn/bleeding_edge", "hash2"),
-      Git("svn find-rev r34567 svn/bleeding_edge", "hash3"),
-      Git("svn find-rev r45678 svn/bleeding_edge", "hash1"),
-      Git("svn find-rev r56789 svn/bleeding_edge", "hash5"),
-      Git("log -1 --format=%s hash4", "Title4"),
-      Git("log -1 --format=%s hash2", "Title2"),
-      Git("log -1 --format=%s hash3", "Title3"),
-      Git("log -1 --format=%s hash1", "Title1"),
-      Git("log -1 --format=%s hash5", "Revert \"Something\""),
-      Git("log -1 hash4", "Title4\nBUG=123\nBUG=234"),
-      Git("log -1 hash2", "Title2\n BUG = v8:123,345"),
-      Git("log -1 hash3", "Title3\nLOG=n\nBUG=567, 456"),
-      Git("log -1 hash1", "Title1\nBUG="),
-      Git("log -1 hash5", "Revert \"Something\"\nBUG=none"),
-      Git("log -1 -p hash4", "patch4"),