Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/push-to-trunk/test_scripts.py

Issue 178223011: Reset trunk to 3.24.35.4 (Closed) Base URL: https://v8.googlecode.com/svn/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/push-to-trunk/push_to_trunk.py ('k') | tools/run-tests.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/push-to-trunk/test_scripts.py
diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py
index 92aabf649296d1cfc3eb92942f6792818b2647ff..90f484911d12f64a0078135c31e76e27af900442 100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -31,17 +31,15 @@ import tempfile
import traceback
import unittest
+import common_includes
+from common_includes import *
+import push_to_trunk
+from push_to_trunk import *
import auto_roll
from auto_roll import AutoRollOptions
from auto_roll import CheckLastPush
from auto_roll import FetchLatestRevision
from auto_roll import SETTINGS_LOCATION
-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 *
TEST_CONFIG = {
@@ -58,15 +56,11 @@ TEST_CONFIG = {
CHROMIUM: "/tmp/test-v8-push-to-trunk-tempfile-chromium",
DEPS_FILE: "/tmp/test-v8-push-to-trunk-tempfile-chromium/DEPS",
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",
}
-def MakeOptions(s=0, l=None, f=False, m=True, r=None, c=None, a=None,
- status_password=None, revert_bleeding_edge=None, p=None):
+def MakeOptions(s=0, l=None, f=False, m=True, r=None, c=None,
+ status_password=None):
"""Convenience wrapper."""
class Options(object):
pass
@@ -75,12 +69,9 @@ def MakeOptions(s=0, l=None, f=False, m=True, r=None, c=None, a=None,
options.l = l
options.f = f
options.m = m
- options.reviewer = r
+ options.r = r
options.c = c
- options.a = a
- options.p = p
options.status_password = status_password
- options.revert_bleeding_edge = revert_bleeding_edge
return options
@@ -236,7 +227,7 @@ class SimpleMock(object):
try:
expected_call = self._recipe[self._index]
except IndexError:
- raise NoRetryException("Calling %s %s" % (self._name, " ".join(args)))
+ raise Exception("Calling %s %s" % (self._name, " ".join(args)))
# Pack expectations without arguments into a list.
if not isinstance(expected_call, list):
@@ -298,7 +289,6 @@ class ScriptTest(unittest.TestCase):
def MakeStep(self, step_class=Step, state=None, options=None):
"""Convenience wrapper."""
options = options or CommonOptions(MakeOptions())
- state = state if state is not None else self._state
return MakeStep(step_class=step_class, number=0, state=state,
config=TEST_CONFIG, options=options,
side_effect_handler=self)
@@ -312,10 +302,6 @@ class ScriptTest(unittest.TestCase):
MOCKS = {
"git": GitMock,
- # TODO(machenbach): Little hack to reuse the git mock for the one svn call
- # in merge-to-branch. The command should be made explicit in the test
- # expectations.
- "svn": GitMock,
"vi": LogMock,
}
@@ -357,7 +343,6 @@ class ScriptTest(unittest.TestCase):
self._rl_mock = SimpleMock("readline")
self._url_mock = SimpleMock("readurl")
self._tmp_files = []
- self._state = {}
def tearDown(self):
Command("rm", "-rf %s*" % TEST_CONFIG[PERSISTFILE_BASENAME])
@@ -371,6 +356,12 @@ class ScriptTest(unittest.TestCase):
self._rl_mock.AssertFinished()
self._url_mock.AssertFinished()
+ def testPersistRestore(self):
+ self.MakeStep().Persist("test1", "")
+ self.assertEquals("", self.MakeStep().Restore("test1"))
+ self.MakeStep().Persist("test2", "AB123")
+ self.assertEquals("AB123", self.MakeStep().Restore("test2"))
+
def testGitOrig(self):
self.assertTrue(Command("git", "--version").startswith("git version"))
@@ -392,7 +383,7 @@ class ScriptTest(unittest.TestCase):
self.ExpectReadline(["Y"])
self.MakeStep().CommonPrepare()
self.MakeStep().PrepareBranch()
- self.assertEquals("some_branch", self._state["current_branch"])
+ self.assertEquals("some_branch", self.MakeStep().Restore("current_branch"))
def testCommonPrepareNoConfirm(self):
self.ExpectGit([
@@ -404,7 +395,7 @@ class ScriptTest(unittest.TestCase):
self.ExpectReadline(["n"])
self.MakeStep().CommonPrepare()
self.assertRaises(Exception, self.MakeStep().PrepareBranch)
- self.assertEquals("some_branch", self._state["current_branch"])
+ self.assertEquals("some_branch", self.MakeStep().Restore("current_branch"))
def testCommonPrepareDeleteBranchFailure(self):
self.ExpectGit([
@@ -417,7 +408,7 @@ class ScriptTest(unittest.TestCase):
self.ExpectReadline(["Y"])
self.MakeStep().CommonPrepare()
self.assertRaises(Exception, self.MakeStep().PrepareBranch)
- self.assertEquals("some_branch", self._state["current_branch"])
+ self.assertEquals("some_branch", self.MakeStep().Restore("current_branch"))
def testInitialEnvironmentChecks(self):
TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
@@ -428,10 +419,14 @@ class ScriptTest(unittest.TestCase):
TEST_CONFIG[VERSION_FILE] = self.MakeTempVersionFile()
step = self.MakeStep()
step.ReadAndPersistVersion()
- self.assertEquals("3", step["major"])
- self.assertEquals("22", step["minor"])
- self.assertEquals("5", step["build"])
- self.assertEquals("0", step["patch"])
+ self.assertEquals("3", self.MakeStep().Restore("major"))
+ self.assertEquals("22", self.MakeStep().Restore("minor"))
+ self.assertEquals("5", self.MakeStep().Restore("build"))
+ self.assertEquals("0", self.MakeStep().Restore("patch"))
+ self.assertEquals("3", step._state["major"])
+ self.assertEquals("22", step._state["minor"])
+ self.assertEquals("5", step._state["build"])
+ self.assertEquals("0", step._state["patch"])
def testRegex(self):
self.assertEqual("(issue 321)",
@@ -459,21 +454,21 @@ class ScriptTest(unittest.TestCase):
TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
self.ExpectGit([
- ["log --format=%H 1234..HEAD", "rev1\nrev2\nrev3\nrev4"],
- ["log -1 --format=%s rev1", "Title text 1"],
- ["log -1 --format=%B rev1", "Title\n\nBUG=\nLOG=y\n"],
- ["log -1 --format=%an rev1", "author1@chromium.org"],
- ["log -1 --format=%s rev2", "Title text 2."],
- ["log -1 --format=%B rev2", "Title\n\nBUG=123\nLOG= \n"],
- ["log -1 --format=%an rev2", "author2@chromium.org"],
- ["log -1 --format=%s rev3", "Title text 3"],
- ["log -1 --format=%B rev3", "Title\n\nBUG=321\nLOG=true\n"],
- ["log -1 --format=%an rev3", "author3@chromium.org"],
- ["log -1 --format=%s rev4", "Title text 4"],
- ["log -1 --format=%B rev4",
+ ["log 1234..HEAD --format=%H", "rev1\nrev2\nrev3\nrev4"],
+ ["log -1 rev1 --format=\"%s\"", "Title text 1"],
+ ["log -1 rev1 --format=\"%B\"", "Title\n\nBUG=\nLOG=y\n"],
+ ["log -1 rev1 --format=\"%an\"", "author1@chromium.org"],
+ ["log -1 rev2 --format=\"%s\"", "Title text 2."],
+ ["log -1 rev2 --format=\"%B\"", "Title\n\nBUG=123\nLOG= \n"],
+ ["log -1 rev2 --format=\"%an\"", "author2@chromium.org"],
+ ["log -1 rev3 --format=\"%s\"", "Title text 3"],
+ ["log -1 rev3 --format=\"%B\"", "Title\n\nBUG=321\nLOG=true\n"],
+ ["log -1 rev3 --format=\"%an\"", "author3@chromium.org"],
+ ["log -1 rev4 --format=\"%s\"", "Title text 4"],
+ ["log -1 rev4 --format=\"%B\"",
("Title\n\nBUG=456\nLOG=Y\n\n"
"Review URL: https://codereview.chromium.org/9876543210\n")],
- ["log -1 --format=%an rev4", "author4@chromium.org"],
+ ["log -1 rev4 --format=\"%an\"", "author4@chromium.org"],
])
# The cl for rev4 on rietveld has an updated LOG flag.
@@ -482,7 +477,7 @@ class ScriptTest(unittest.TestCase):
"Title\n\nBUG=456\nLOG=N\n\n"],
])
- self._state["last_push_bleeding_edge"] = "1234"
+ self.MakeStep().Persist("last_push", "1234")
self.MakeStep(PrepareChangeLog).Run()
actual_cl = FileToText(TEST_CONFIG[CHANGELOG_ENTRY_FILE])
@@ -514,10 +509,10 @@ class ScriptTest(unittest.TestCase):
#"""
self.assertEquals(expected_cl, actual_cl)
- self.assertEquals("3", self._state["major"])
- self.assertEquals("22", self._state["minor"])
- self.assertEquals("5", self._state["build"])
- self.assertEquals("0", self._state["patch"])
+ self.assertEquals("3", self.MakeStep().Restore("major"))
+ self.assertEquals("22", self.MakeStep().Restore("minor"))
+ self.assertEquals("5", self.MakeStep().Restore("build"))
+ self.assertEquals("0", self.MakeStep().Restore("patch"))
def testEditChangeLog(self):
TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
@@ -537,7 +532,7 @@ class ScriptTest(unittest.TestCase):
def testIncrementVersion(self):
TEST_CONFIG[VERSION_FILE] = self.MakeTempVersionFile()
- self._state["build"] = "5"
+ self.MakeStep().Persist("build", "5")
self.ExpectReadline([
"Y", # Increment build number.
@@ -545,10 +540,10 @@ class ScriptTest(unittest.TestCase):
self.MakeStep(IncrementVersion).Run()
- self.assertEquals("3", self._state["new_major"])
- self.assertEquals("22", self._state["new_minor"])
- self.assertEquals("6", self._state["new_build"])
- self.assertEquals("0", self._state["new_patch"])
+ self.assertEquals("3", self.MakeStep().Restore("new_major"))
+ self.assertEquals("22", self.MakeStep().Restore("new_minor"))
+ self.assertEquals("6", self.MakeStep().Restore("new_build"))
+ self.assertEquals("0", self.MakeStep().Restore("new_patch"))
def testLastChangeLogEntries(self):
TEST_CONFIG[CHANGELOG_FILE] = self.MakeEmptyTempFile()
@@ -576,8 +571,8 @@ class ScriptTest(unittest.TestCase):
["svn find-rev hash1", "123455\n"],
])
- self._state["prepare_commit_hash"] = "hash1"
- self._state["date"] = "1999-11-11"
+ self.MakeStep().Persist("prepare_commit_hash", "hash1")
+ self.MakeStep().Persist("date", "1999-11-11")
self.MakeStep(SquashCommits).Run()
self.assertEquals(FileToText(TEST_CONFIG[COMMITMSG_FILE]), expected_msg)
@@ -668,49 +663,42 @@ Performance and stability improvements on all platforms.""", commit)
["branch", " branch1\n* branch2\n"],
["branch", " branch1\n* branch2\n"],
["checkout -b %s svn/bleeding_edge" % TEST_CONFIG[BRANCHNAME], ""],
- [("log -1 --format=%H --grep="
- "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" "
- "svn/trunk"), "hash2\n"],
- ["log -1 hash2", "Log message\n"],
- ["log -1 --format=%s hash2",
- "Version 3.4.5 (based on bleeding_edge revision r1234)\n"],
- ["svn find-rev r1234", "hash3\n"],
- ["log --format=%H hash3..HEAD", "rev1\n"],
- ["log -1 --format=%s rev1", "Log text 1.\n"],
- ["log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"],
- ["log -1 --format=%an rev1", "author1@chromium.org\n"],
- [("commit -am \"Prepare push to trunk. "
+ ["log -1 --format=%H ChangeLog", "1234\n"],
+ ["log -1 1234", "Last push ouput\n"],
+ ["log 1234..HEAD --format=%H", "rev1\n"],
+ ["log -1 rev1 --format=\"%s\"", "Log text 1.\n"],
+ ["log -1 rev1 --format=\"%B\"", "Text\nLOG=YES\nBUG=v8:321\nText\n"],
+ ["log -1 rev1 --format=\"%an\"", "author1@chromium.org\n"],
+ [("commit -a -m \"Prepare push to trunk. "
"Now working on version 3.22.6.%s\"" % review_suffix),
" 2 files changed\n",
CheckPreparePush],
- [("cl upload --send-mail --email \"author@chromium.org\" "
- "-r \"reviewer@chromium.org\"%s" % force_flag),
+ ["cl upload -r \"reviewer@chromium.org\" --send-mail%s" % force_flag,
"done\n"],
["cl presubmit", "Presubmit successfull\n"],
["cl dcommit -f --bypass-hooks", "Closing issue\n"],
["svn fetch", "fetch result\n"],
- ["checkout -f svn/bleeding_edge", ""],
+ ["checkout svn/bleeding_edge", ""],
[("log -1 --format=%H --grep=\"Prepare push to trunk. "
"Now working on version 3.22.6.\""),
"hash1\n"],
["diff svn/trunk hash1", "patch content\n"],
["svn find-rev hash1", "123455\n"],
["checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], ""],
- ["apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""],
+ ["apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""],
["add \"%s\"" % TEST_CONFIG[VERSION_FILE], ""],
- ["commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "", CheckSVNCommit],
+ ["commit -F \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "", CheckSVNCommit],
["svn dcommit 2>&1", "Some output\nCommitted r123456\nSome output\n"],
["svn tag 3.22.5 -m \"Tagging version 3.22.5\"", ""],
["status -s -uno", ""],
- ["checkout -f master", ""],
+ ["checkout master", ""],
["pull", ""],
["checkout -b v8-roll-123456", ""],
[("commit -am \"Update V8 to version 3.22.5 "
"(based on bleeding_edge revision r123455).\n\n"
"TBR=reviewer@chromium.org\""),
""],
- ["cl upload --send-mail --email \"author@chromium.org\"%s" % force_flag,
- ""],
+ ["cl upload --send-mail%s" % force_flag, ""],
["checkout -f some_branch", ""],
["branch -D %s" % TEST_CONFIG[TEMP_BRANCH], ""],
["branch -D %s" % TEST_CONFIG[BRANCHNAME], ""],
@@ -740,7 +728,7 @@ Performance and stability improvements on all platforms.""", commit)
if force:
self.ExpectReadline([])
- options = MakeOptions(f=force, m=manual, a="author@chromium.org",
+ options = MakeOptions(f=force, m=manual,
r="reviewer@chromium.org" if not manual else None,
c = TEST_CONFIG[CHROMIUM])
RunPushToTrunk(TEST_CONFIG, PushToTrunkOptions(options), self)
@@ -801,20 +789,14 @@ Performance and stability improvements on all platforms.""", commit)
["status -s -b -uno", "## some_branch\n"],
["svn fetch", ""],
["svn log -1 --oneline", "r100 | Text"],
- [("log -1 --format=%H --grep=\""
- "^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\""
- " svn/trunk"), "push_hash\n"],
- ["svn find-rev push_hash", "65"],
+ ["svn log -1 --oneline ChangeLog", "r65 | Prepare push to trunk..."],
])
auto_roll.RunAutoRoll(TEST_CONFIG, AutoRollOptions(
MakeOptions(status_password=status_password)), self)
- state = json.loads(FileToText("%s-state.json"
- % TEST_CONFIG[PERSISTFILE_BASENAME]))
-
- self.assertEquals("100", state["lkgr"])
- self.assertEquals("100", state["latest"])
+ self.assertEquals("100", self.MakeStep().Restore("lkgr"))
+ self.assertEquals("100", self.MakeStep().Restore("latest"))
def testAutoRollStoppedBySettings(self):
TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
@@ -852,137 +834,6 @@ Performance and stability improvements on all platforms.""", commit)
auto_roll.RunAutoRoll(TEST_CONFIG, AutoRollOptions(MakeOptions()), self)
self.assertRaises(Exception, RunAutoRoll)
- def testMergeToBranch(self):
- TEST_CONFIG[ALREADY_MERGING_SENTINEL_FILE] = self.MakeEmptyTempFile()
- TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
- TEST_CONFIG[VERSION_FILE] = self.MakeTempVersionFile()
- os.environ["EDITOR"] = "vi"
- extra_patch = self.MakeEmptyTempFile()
-
- def VerifyPatch(patch):
- return lambda: self.assertEquals(patch,
- FileToText(TEST_CONFIG[TEMPORARY_PATCH_FILE]))
-
- msg = """Merged r12345, r23456, r34567, r45678, r56789 into trunk branch.
-
-Title4
-
-Title2
-
-Title3
-
-Title1
-
-Title5
-
-BUG=123,234,345,456,567,v8:123
-LOG=N
-"""
-
- 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.ExpectGit([
- ["status -s -uno", ""],
- ["status -s -b -uno", "## some_branch\n"],
- ["svn fetch", ""],
- ["branch", " branch1\n* branch2\n"],
- ["checkout -b %s" % TEST_CONFIG[TEMP_BRANCH], ""],
- ["branch", " branch1\n* branch2\n"],
- ["checkout -b %s svn/trunk" % TEST_CONFIG[BRANCHNAME], ""],
- ["log --format=%H --grep=\"Port r12345\" --reverse svn/bleeding_edge",
- "hash1\nhash2"],
- ["svn find-rev hash1 svn/bleeding_edge", "45678"],
- ["log -1 --format=%s hash1", "Title1"],
- ["svn find-rev hash2 svn/bleeding_edge", "23456"],
- ["log -1 --format=%s hash2", "Title2"],
- ["log --format=%H --grep=\"Port r23456\" --reverse svn/bleeding_edge",
- ""],
- ["log --format=%H --grep=\"Port r34567\" --reverse svn/bleeding_edge",
- "hash3"],
- ["svn find-rev hash3 svn/bleeding_edge", "56789"],
- ["log -1 --format=%s hash3", "Title3"],
- ["svn find-rev r12345 svn/bleeding_edge", "hash4"],
- # Simulate svn being down which stops the script.
- ["svn find-rev r23456 svn/bleeding_edge", None],
- # Restart script in the failing step.
- ["svn find-rev r12345 svn/bleeding_edge", "hash4"],
- ["svn find-rev r23456 svn/bleeding_edge", "hash2"],
- ["svn find-rev r34567 svn/bleeding_edge", "hash3"],
- ["svn find-rev r45678 svn/bleeding_edge", "hash1"],
- ["svn find-rev r56789 svn/bleeding_edge", "hash5"],
- ["log -1 --format=%s hash4", "Title4"],
- ["log -1 --format=%s hash2", "Title2"],
- ["log -1 --format=%s hash3", "Title3"],
- ["log -1 --format=%s hash1", "Title1"],
- ["log -1 --format=%s hash5", "Title5"],
- ["log -1 hash4", "Title4\nBUG=123\nBUG=234"],
- ["log -1 hash2", "Title2\n BUG = v8:123,345"],
- ["log -1 hash3", "Title3\nLOG=n\nBUG=567, 456"],
- ["log -1 hash1", "Title1"],
- ["log -1 hash5", "Title5"],
- ["log -1 -p hash4", "patch4"],
- ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],
- "", VerifyPatch("patch4")],
- ["log -1 -p hash2", "patch2"],
- ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],
- "", VerifyPatch("patch2")],
- ["log -1 -p hash3", "patch3"],
- ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],
- "", VerifyPatch("patch3")],
- ["log -1 -p hash1", "patch1"],
- ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],
- "", VerifyPatch("patch1")],
- ["log -1 -p hash5", "patch5"],
- ["apply --index --reject \"%s\"" % TEST_CONFIG[TEMPORARY_PATCH_FILE],
- "", VerifyPatch("patch5")],
- ["apply --index --reject \"%s\"" % extra_patch, ""],
- ["commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], ""],
- ["cl upload --send-mail -r \"reviewer@chromium.org\"", ""],
- ["checkout -f %s" % TEST_CONFIG[BRANCHNAME], ""],
- ["cl presubmit", "Presubmit successfull\n"],
- ["cl dcommit -f --bypass-hooks", "Closing issue\n", VerifySVNCommit],
- ["svn fetch", ""],
- ["log -1 --format=%%H --grep=\"%s\" svn/trunk" % msg, "hash6"],
- ["svn find-rev hash6", "1324"],
- [("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\""), ""],
- ["checkout -f some_branch", ""],
- ["branch -D %s" % TEST_CONFIG[TEMP_BRANCH], ""],
- ["branch -D %s" % TEST_CONFIG[BRANCHNAME], ""],
- ])
-
- self.ExpectReadline([
- "Y", # Automatically add corresponding ports (34567, 56789)?
- "Y", # Automatically increment patch level?
- "reviewer@chromium.org", # V8 reviewer.
- "LGTM", # Enter LGTM for V8 CL.
- ])
-
- options = MakeOptions(p=extra_patch, f=True)
- # r12345 and r34567 are patches. r23456 (included) and r45678 are the MIPS
- # ports of r12345. r56789 is the MIPS port of r34567.
- args = ["trunk", "12345", "23456", "34567"]
- self.assertTrue(merge_to_branch.ProcessOptions(options, args))
-
- # The first run of the script stops because of the svn being down.
- self.assertRaises(GitFailedException,
- lambda: RunMergeToBranch(TEST_CONFIG,
- MergeToBranchOptions(options, args),
- self))
-
- # Test that state recovery after restarting the script works.
- options.s = 3
- RunMergeToBranch(TEST_CONFIG, MergeToBranchOptions(options, args), self)
-
-
class SystemTest(unittest.TestCase):
def testReload(self):
step = MakeStep(step_class=PrepareChangeLog, number=0, state={}, config={},
« no previous file with comments | « tools/push-to-trunk/push_to_trunk.py ('k') | tools/run-tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698