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 9752ab7d1e1dda3f415e52dcafd5a15863003638..82a4d15f2eccc55f5c09762e623db703aeb897a6 100644 |
--- a/tools/push-to-trunk/test_scripts.py |
+++ b/tools/push-to-trunk/test_scripts.py |
@@ -1167,6 +1167,33 @@ LOG=N |
MergeToBranch(TEST_CONFIG, self).Run(args) |
def testReleases(self): |
+ tag_response_text = """ |
+------------------------------------------------------------------------ |
+r22631 | author1@chromium.org | 2014-07-28 02:05:29 +0200 (Mon, 28 Jul 2014) |
+Changed paths: |
+ A /tags/3.28.43 (from /trunk:22630) |
+ |
+Tagging version 3.28.43 |
+------------------------------------------------------------------------ |
+r22629 | author2@chromium.org | 2014-07-26 05:09:29 +0200 (Sat, 26 Jul 2014) |
+Changed paths: |
+ A /tags/3.28.41 (from /branches/bleeding_edge:22626) |
+ |
+Tagging version 3.28.41 |
+------------------------------------------------------------------------ |
+r22556 | author3@chromium.org | 2014-07-23 13:31:59 +0200 (Wed, 23 Jul 2014) |
+Changed paths: |
+ A /tags/3.27.34.7 (from /branches/3.27:22555) |
+ |
+Tagging version 3.27.34.7 |
+------------------------------------------------------------------------ |
+r22627 | author4@chromium.org | 2014-07-26 01:39:15 +0200 (Sat, 26 Jul 2014) |
+Changed paths: |
+ A /tags/3.28.40 (from /branches/bleeding_edge:22624) |
+ |
+Tagging version 3.28.40 |
+------------------------------------------------------------------------ |
+""" |
json_output = self.MakeEmptyTempFile() |
csv_output = self.MakeEmptyTempFile() |
TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile() |
@@ -1230,6 +1257,15 @@ LOG=N |
Git("log -1 --format=%ci hash6", ""), |
Git("checkout -f HEAD -- %s" % TEST_CONFIG[VERSION_FILE], "", |
cb=ResetVersion(22, 5)), |
+ Git("reset --hard svn/bleeding_edge", ""), |
+ Git("log https://v8.googlecode.com/svn/tags -v --limit 20", |
+ tag_response_text), |
+ Git("svn find-rev r22626", "hash_22626"), |
+ Git("svn find-rev hash_22626", "22626"), |
+ Git("log -1 --format=%ci hash_22626", "01:23"), |
+ Git("svn find-rev r22624", "hash_22624"), |
+ Git("svn find-rev hash_22624", "22624"), |
+ Git("log -1 --format=%ci hash_22624", "02:34"), |
Git("status -s -uno", ""), |
Git("checkout -f master", ""), |
Git("pull", ""), |
@@ -1260,12 +1296,22 @@ LOG=N |
Releases(TEST_CONFIG, self).Run(args) |
# Check expected output. |
- csv = ("3.22.3,trunk,345,4567,\r\n" |
+ csv = ("3.28.41,bleeding_edge,22626,,\r\n" |
+ "3.28.40,bleeding_edge,22624,,\r\n" |
+ "3.22.3,trunk,345,4567,\r\n" |
"3.21.2,3.21,123,,\r\n" |
"3.3.1.1,3.3,234,,12\r\n") |
self.assertEquals(csv, FileToText(csv_output)) |
expected_json = [ |
+ {"bleeding_edge": "22626", "patches_merged": "", "version": "3.28.41", |
+ "chromium_revision": "", "branch": "bleeding_edge", "revision": "22626", |
+ "review_link": "", "date": "01:23", "chromium_branch": "", |
+ "revision_link": "https://code.google.com/p/v8/source/detail?r=22626"}, |
+ {"bleeding_edge": "22624", "patches_merged": "", "version": "3.28.40", |
+ "chromium_revision": "", "branch": "bleeding_edge", "revision": "22624", |
+ "review_link": "", "date": "02:34", "chromium_branch": "", |
+ "revision_link": "https://code.google.com/p/v8/source/detail?r=22624"}, |
{"bleeding_edge": "", "patches_merged": "", "version": "3.22.3", |
"chromium_revision": "4567", "branch": "trunk", "revision": "345", |
"review_link": "", "date": "", "chromium_branch": "7", |