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

Unified Diff: tools/release/test_scripts.py

Issue 1063073003: Retrieval of information by release channel (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Fixed broken test Created 5 years, 8 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/release/releases.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/release/test_scripts.py
diff --git a/tools/release/test_scripts.py b/tools/release/test_scripts.py
index bbbaee03e66e1895749764538ba6afb7c6df3c24..1738aea7fd1e71a7dac1be85fd9dedd316549a6a 100644
--- a/tools/release/test_scripts.py
+++ b/tools/release/test_scripts.py
@@ -1419,8 +1419,10 @@ Cr-Commit-Position: refs/heads/4.2.71@{#1}
Cmd("git branch -r", " weird/123\n branch-heads/7\n", cwd=chrome_dir),
Cmd("git show refs/branch-heads/7:DEPS", c_deps % "hash_345",
cwd=chrome_dir),
+ URL("http://omahaproxy.appspot.com/all.json",
+ "{}"),
Michael Achenbach 2015/04/15 09:35:39 Looks good, could you provide some dummy test data
Michael Hablich 2015/04/15 09:37:18 Yep. Wanted to make the tests pass first.
Cmd("git checkout -f origin/master", ""),
- Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
+ Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], "")
])
args = ["-c", TEST_CONFIG["CHROMIUM"],
@@ -1436,65 +1438,66 @@ Cr-Commit-Position: refs/heads/4.2.71@{#1}
"3.3.1.1,3.3,234,,abc12\r\n")
self.assertEquals(csv, FileToText(csv_output))
- expected_json = [
- {
- "revision": "1",
- "revision_git": "hash_456",
- "master_position": "456",
- "master_hash": "master_456",
- "patches_merged": "",
- "version": "4.2.71",
- "chromium_revision": "5678",
- "branch": "4.2.71",
- "review_link": "",
- "date": "02:15",
- "chromium_branch": "",
- # FIXME(machenbach): Fix revisions link for git.
- "revision_link": "https://code.google.com/p/v8/source/detail?r=1",
- },
- {
- "revision": "345",
- "revision_git": "hash_345",
- "master_position": "",
- "master_hash": "",
- "patches_merged": "",
- "version": "3.22.3",
- "chromium_revision": "4567:5677",
- "branch": "candidates",
- "review_link": "",
- "date": "",
- "chromium_branch": "7",
- "revision_link": "https://code.google.com/p/v8/source/detail?r=345",
- },
- {
- "revision": "123",
- "revision_git": "hash_123",
- "patches_merged": "",
- "master_position": "",
- "master_hash": "",
- "version": "3.21.2",
- "chromium_revision": "",
- "branch": "3.21",
- "review_link": "",
- "date": "03:15",
- "chromium_branch": "",
- "revision_link": "https://code.google.com/p/v8/source/detail?r=123",
- },
- {
- "revision": "234",
- "revision_git": "hash_234",
- "patches_merged": "abc12",
- "master_position": "",
- "master_hash": "",
- "version": "3.3.1.1",
- "chromium_revision": "",
- "branch": "3.3",
- "review_link": "fake.com",
- "date": "18:15",
- "chromium_branch": "",
- "revision_link": "https://code.google.com/p/v8/source/detail?r=234",
- },
- ]
+ expected_json = {'chrome_releases':{'canaries':[]},
Michael Achenbach 2015/04/15 09:35:38 nit: please keep indentation levels at a minimum -
Michael Achenbach 2015/04/15 09:35:39 nit: Always space after :
Michael Hablich 2015/04/15 09:37:18 Acknowledged.
+ 'releases':[
+ {
+ "revision": "1",
+ "revision_git": "hash_456",
+ "master_position": "456",
+ "master_hash": "master_456",
+ "patches_merged": "",
+ "version": "4.2.71",
+ "chromium_revision": "5678",
+ "branch": "4.2.71",
+ "review_link": "",
+ "date": "02:15",
+ "chromium_branch": "",
+ # FIXME(machenbach): Fix revisions link for git.
+ "revision_link": "https://code.google.com/p/v8/source/detail?r=1",
+ },
+ {
+ "revision": "345",
+ "revision_git": "hash_345",
+ "master_position": "",
+ "master_hash": "",
+ "patches_merged": "",
+ "version": "3.22.3",
+ "chromium_revision": "4567:5677",
+ "branch": "candidates",
+ "review_link": "",
+ "date": "",
+ "chromium_branch": "7",
+ "revision_link": "https://code.google.com/p/v8/source/detail?r=345",
+ },
+ {
+ "revision": "123",
+ "revision_git": "hash_123",
+ "patches_merged": "",
+ "master_position": "",
+ "master_hash": "",
+ "version": "3.21.2",
+ "chromium_revision": "",
+ "branch": "3.21",
+ "review_link": "",
+ "date": "03:15",
+ "chromium_branch": "",
+ "revision_link": "https://code.google.com/p/v8/source/detail?r=123",
+ },
+ {
+ "revision": "234",
+ "revision_git": "hash_234",
+ "patches_merged": "abc12",
+ "master_position": "",
+ "master_hash": "",
+ "version": "3.3.1.1",
+ "chromium_revision": "",
+ "branch": "3.3",
+ "review_link": "fake.com",
+ "date": "18:15",
+ "chromium_branch": "",
+ "revision_link": "https://code.google.com/p/v8/source/detail?r=234",
+ }]
Michael Achenbach 2015/04/15 09:35:39 nit: }, ]
Michael Hablich 2015/04/15 09:37:18 Acknowledged.
+ }
self.assertEquals(expected_json, json.loads(FileToText(json_output)))
« no previous file with comments | « tools/release/releases.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698