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 108d1519e0ef8b4740a713167b4b81b81eb3ca3b..a55a9bf1afffecd59f3faa41131952bd256e6424 100644 |
--- a/tools/push-to-trunk/test_scripts.py |
+++ b/tools/push-to-trunk/test_scripts.py |
@@ -1228,6 +1228,11 @@ LOG=N |
Git("svn find-rev c_hash2", "4567"), |
Git("checkout -f HEAD -- %s" % TEST_CONFIG[DEPS_FILE], "", |
cb=ResetDEPS(567)), |
+ Git("branch -r", " weird/123\n branch-heads/7\n"), |
+ Git("checkout -f branch-heads/7 -- %s" % TEST_CONFIG[DEPS_FILE], "", |
+ cb=ResetDEPS(345)), |
+ Git("checkout -f HEAD -- %s" % TEST_CONFIG[DEPS_FILE], "", |
+ cb=ResetDEPS(567)), |
Git("checkout -f master", ""), |
Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], ""), |
Git("checkout -f some_branch", ""), |
@@ -1250,15 +1255,15 @@ LOG=N |
expected_json = [ |
{"bleeding_edge": "", "patches_merged": "", "version": "3.22.3", |
"chromium_revision": "4567", "branch": "trunk", "revision": "345", |
- "review_link": "", "date": "", |
+ "review_link": "", "date": "", "chromium_branch": "7", |
"revision_link": "https://code.google.com/p/v8/source/detail?r=345"}, |
{"patches_merged": "", "bleeding_edge": "", "version": "3.21.2", |
"chromium_revision": "", "branch": "3.21", "revision": "123", |
- "review_link": "", "date": "03:15", |
+ "review_link": "", "date": "03:15", "chromium_branch": "", |
"revision_link": "https://code.google.com/p/v8/source/detail?r=123"}, |
{"patches_merged": "12", "bleeding_edge": "", "version": "3.3.1.1", |
"chromium_revision": "", "branch": "3.3", "revision": "234", |
- "review_link": "fake.com", "date": "18:15", |
+ "review_link": "fake.com", "date": "18:15", "chromium_branch": "", |
"revision_link": "https://code.google.com/p/v8/source/detail?r=234"}, |
] |
self.assertEquals(expected_json, json.loads(FileToText(json_output))) |