| Index: tools/release/test_scripts.py
|
| diff --git a/tools/release/test_scripts.py b/tools/release/test_scripts.py
|
| index bbbaee03e66e1895749764538ba6afb7c6df3c24..95cdcc0d978686d64bd24eb5072f6b408de24293 100644
|
| --- a/tools/release/test_scripts.py
|
| +++ b/tools/release/test_scripts.py
|
| @@ -1419,8 +1419,18 @@ 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", """[{
|
| + "os": "win",
|
| + "versions": [{
|
| + "version": "1.1.1.1",
|
| + "v8_version": "2.2.2.2",
|
| + "current_reldate": "04/09/15",
|
| + "os": "win",
|
| + "channel": "canary"
|
| + }]
|
| + }]"""),
|
| 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,7 +1446,15 @@ 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 = [
|
| + expected_json = {"chrome_releases":{
|
| + "canaries": [
|
| + {
|
| + "chrome_version": "1.1.1.1",
|
| + "os": "win",
|
| + "release_date": "04/09/15",
|
| + "v8_version": "2.2.2.2",
|
| + }]},
|
| + "releases":[
|
| {
|
| "revision": "1",
|
| "revision_git": "hash_456",
|
| @@ -1493,8 +1511,8 @@ Cr-Commit-Position: refs/heads/4.2.71@{#1}
|
| "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)))
|
|
|
|
|
|
|