Skip to content

V
V8
Commit 2f6e39d7 authored by machenbach@chromium.org's avatar machenbach@chromium.org
Browse files
Options

Refactoring: Unify all mocks in auto roll tests. 

This allows to use shell command, readline and url
expectations in the same list, which makes their interaction
more explicit.

TBR=jarin@chromium.org

Review URL: https://codereview.chromium.org/533693002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23624 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent aed2143f
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 149 deletions
tools/push-to-trunk/test_scripts.py
View file @ 2f6e39d7
......@@ -253,9 +253,9 @@ Committed: https://code.google.com/p/v8/source/detail?r=18210
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"),
......@@ -278,38 +278,40 @@ def URL(*args, **kwargs):
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.
......@@ -327,8 +329,8 @@ class SimpleMock(object):
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):
......@@ -361,24 +363,21 @@ class ScriptTest(unittest.TestCase):
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
......@@ -394,22 +393,12 @@ class ScriptTest(unittest.TestCase):
def GetUTCStamp(self):
return "100000"
def ExpectCmd(self, *args):
"""Convenience wrapper."""
self._cmd_mock.Expect(*args)
def ExpectReadline(self, *args):
"""Convenience wrapper."""
self._rl_mock.Expect(*args)
def ExpectReadURL(self, *args):
def Expect(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 = {}
......@@ -421,53 +410,51 @@ class ScriptTest(unittest.TestCase):
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"])
......@@ -510,7 +497,7 @@ class ScriptTest(unittest.TestCase):
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")
])
......@@ -522,7 +509,7 @@ class ScriptTest(unittest.TestCase):
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"),
......@@ -537,13 +524,9 @@ class ScriptTest(unittest.TestCase):
Cmd("git log -1 --format=%B rev4",
("Title\n\nBUG=456\nLOG=Y\n\n"
"Review URL: https://codereview.chromium.org/9876543210\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"),
Cmd("git log -1 --format=%an rev4", "author4@chromium.org"),
])
self._state["last_push_bleeding_edge"] = "1234"
......@@ -585,11 +568,9 @@ class ScriptTest(unittest.TestCase):
TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
TextToFile(" New \n\tLines \n", TEST_CONFIG[CHANGELOG_ENTRY_FILE])
os.environ["EDITOR"] = "vi"
self.ExpectCmd([
Cmd("vi %s" % TEST_CONFIG[CHANGELOG_ENTRY_FILE], ""),
])
self.ExpectReadline([
self.Expect([
RL(""), # Open editor.
Cmd("vi %s" % TEST_CONFIG[CHANGELOG_ENTRY_FILE], ""),
])
self.RunStep(PushToTrunk, EditChangeLog)
......@@ -606,14 +587,11 @@ class ScriptTest(unittest.TestCase):
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.
])
......@@ -629,7 +607,7 @@ class ScriptTest(unittest.TestCase):
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"),
])
......@@ -746,6 +724,10 @@ Performance and stability improvements on all platforms.""", commit)
"\"^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"),
......@@ -754,11 +736,17 @@ Performance and stability improvements on all platforms.""", commit)
"", 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 += [
......@@ -775,6 +763,10 @@ Performance and stability improvements on all platforms.""", commit)
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\"", ""),
......@@ -782,20 +774,7 @@ Performance and stability improvements on all platforms.""", commit)
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")
......@@ -843,7 +822,7 @@ def get_list():
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", ""),
......@@ -853,6 +832,8 @@ def get_list():
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..."),
......@@ -860,6 +841,10 @@ def get_list():
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 "
......@@ -867,22 +852,8 @@ def get_list():
""),
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]
......@@ -904,7 +875,7 @@ def get_list():
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"),
......@@ -922,17 +893,14 @@ def get_list():
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"),
......@@ -952,9 +920,7 @@ def get_list():
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", ""),
......@@ -968,15 +934,12 @@ def get_list():
TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
TEST_CONFIG[SETTINGS_LOCATION] = "~/.doesnotexist"
self.ExpectReadURL([
URL("https://v8-status.appspot.com/current?format=json",
"{\"message\": \"Tree is throttled (no push)\"}"),
])
self.ExpectCmd([
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():
......@@ -984,7 +947,7 @@ def get_list():
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\"},"
......@@ -1008,19 +971,16 @@ deps = {
"""
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\"}]}")),
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"),
URL("http://src.chromium.org/svn/trunk/src/DEPS",
self.FAKE_DEPS),
])
result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
......@@ -1030,19 +990,17 @@ deps = {
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\"}]}")),
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"),
URL("http://src.chromium.org/svn/trunk/src/DEPS",
self.FAKE_DEPS),
])
result = auto_roll.AutoRoll(TEST_CONFIG, self).Run(
......@@ -1086,7 +1044,7 @@ LOG=N
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", ""),
......@@ -1107,6 +1065,7 @@ LOG=N
"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),
......@@ -1147,9 +1106,12 @@ LOG=N
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),
......@@ -1164,13 +1126,6 @@ LOG=N
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",
......@@ -1260,7 +1215,7 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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", ""),
......@@ -1392,7 +1347,7 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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", ""),
......@@ -1400,6 +1355,7 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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-]*$\""),
......@@ -1410,6 +1366,8 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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"
......@@ -1422,12 +1380,6 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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):
......@@ -1439,7 +1391,7 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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", ""),
......@@ -1465,6 +1417,10 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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"),
......@@ -1475,13 +1431,6 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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.
......@@ -1489,7 +1438,7 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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]),
])
......@@ -1502,7 +1451,7 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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]),
])
......@@ -1518,7 +1467,7 @@ git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22624 123
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^", ""),
])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment