Retrieval of information by release channel

tools/release/test_scripts.py

 #!/usr/bin/env python
 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 1401 matching lines @@
           cwd=chrome_dir),
       Cmd("git show c_hash2:DEPS", c_deps % "hash_345", cwd=chrome_dir),
       Cmd("git log -1 --format=%B c_hash2", c_hash2_commit_log,
           cwd=chrome_dir),
       Cmd("git show c_hash3:DEPS", c_deps % "deadbeef", cwd=chrome_dir),
       Cmd("git log -1 --format=%B c_hash3", c_hash3_commit_log,
           cwd=chrome_dir),
       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"],
             "--json", json_output,
             "--csv", csv_output,
             "--max-releases", "1"]
     Releases(TEST_CONFIG, self).Run(args)
 
     # Check expected output.
     csv = ("4.2.71,4.2.71,1,5678,\r\n"
            "3.22.3,candidates,345,4567:5677,\r\n"
            "3.21.2,3.21,123,,\r\n"
            "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",
         "master_position": "456",
         "master_hash": "master_456",
         "patches_merged": "",
         "version": "4.2.71",
         "chromium_revision": "5678",
         "branch": "4.2.71",
         "review_link": "",
@@ skipping 36 matching lines @@
         "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",
-      },
-    ]
+      },],
+    }
     self.assertEquals(expected_json, json.loads(FileToText(json_output)))
 
 
 class SystemTest(unittest.TestCase):
   def testReload(self):
     options = ScriptsBase(
         TEST_CONFIG, DEFAULT_SIDE_EFFECT_HANDLER, {}).MakeOptions([])
     step = MakeStep(step_class=PrepareChangeLog, number=0, state={}, config={},
                     options=options,
                     side_effect_handler=DEFAULT_SIDE_EFFECT_HANDLER)
     body = step.Reload(
 """------------------------------------------------------------------------
 r17997 | machenbach@chromium.org | 2013-11-22 11:04:04 +0100 (...) | 6 lines
 
 Prepare push to trunk.  Now working on version 3.23.11.
 
 R=danno@chromium.org
 
 Review URL: https://codereview.chromium.org/83173002
 
 ------------------------------------------------------------------------""")
     self.assertEquals(
 """Prepare push to trunk.  Now working on version 3.23.11.
 
 R=danno@chromium.org
 
 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)