rebaseline_server: include setA/setB descriptions in output JSON

gm/rebaseline_server/server.py

 #!/usr/bin/python
 
 """
 Copyright 2013 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 HTTP server for our HTML rebaseline viewer.
 """
@@ skipping 98 matching lines @@
 CONFIG_PAIRS_TO_COMPARE = [('8888', 'gpu')]
 
 # SKP results that are available to compare.
 #
 # TODO(stephana): We don't actually want to maintain this list of platforms.
 # We are just putting them in here for now, as "convenience" links for testing
 # SKP diffs.
 # Ultimately, we will depend on buildbot steps linking to their own diffs on
 # the shared rebaseline_server instance.
 _SKP_BASE_GS_URL = 'gs://' + buildbot_globals.Get('skp_summaries_bucket')
+_SKP_BASE_REPO_URL = (
+    compare_rendered_pictures.REPO_URL_PREFIX + posixpath.join(
+        'expectations', 'skp'))
 _SKP_PLATFORMS = [
     'Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug',
     'Test-Ubuntu12-ShuttleA-GTX660-x86-Release',
 ]
 
 _HTTP_HEADER_CONTENT_LENGTH = 'Content-Length'
 _HTTP_HEADER_CONTENT_TYPE = 'Content-Type'
 
 _SERVER = None   # This gets filled in by main()
 
@@ skipping 86 matching lines @@
 
     if _SKP_PLATFORMS:
       file_handle.write('\n<li>Rendered SKPs:<ul>')
       for builder in _SKP_PLATFORMS:
         file_handle.write(
             '\n<li><a href="../live-view.html#live-view.html?%s">' %
             urllib.urlencode({
                 LIVE_PARAM__SET_A_SECTION:
                     gm_json.JSONKEY_EXPECTEDRESULTS,
                 LIVE_PARAM__SET_A_DIR:
-                    posixpath.join(_SKP_BASE_GS_URL, builder),
+                    posixpath.join(_SKP_BASE_REPO_URL, builder),
                 LIVE_PARAM__SET_B_SECTION:
                     gm_json.JSONKEY_ACTUALRESULTS,
                 LIVE_PARAM__SET_B_DIR:
                     posixpath.join(_SKP_BASE_GS_URL, builder),
             }))
         file_handle.write('expected vs actuals on %s</a></li>' % builder)
       file_handle.write(
           '\n<li><a href="../live-view.html#live-view.html?%s">' %
           urllib.urlencode({
               LIVE_PARAM__SET_A_SECTION:
@@ skipping 345 matching lines @@
     """ Handle a GET request for live-generated image diff data.
 
     Args:
       url_remainder: string indicating which image diffs to generate
       prefetch_only: if True, the user isn't waiting around for results
     """
     param_dict = urlparse.parse_qs(url_remainder)
     download_all_images = (
         param_dict.get(LIVE_PARAM__DOWNLOAD_ONLY_DIFFERING, [''])[0].lower()
         not in ['1', 'true'])
+    setA_dirs = param_dict[LIVE_PARAM__SET_A_DIR]
+    setB_dirs = param_dict[LIVE_PARAM__SET_B_DIR]
     setA_section = self._validate_summary_section(
         param_dict.get(LIVE_PARAM__SET_A_SECTION, [None])[0])
     setB_section = self._validate_summary_section(
         param_dict.get(LIVE_PARAM__SET_B_SECTION, [None])[0])
     results_obj = compare_rendered_pictures.RenderedPicturesComparisons(
-        setA_dirs=param_dict[LIVE_PARAM__SET_A_DIR],
-        setB_dirs=param_dict[LIVE_PARAM__SET_B_DIR],
+        setA_dirs=setA_dirs, setB_dirs=setB_dirs,
         setA_section=setA_section, setB_section=setB_section,
         image_diff_db=_SERVER.image_diff_db,
         diff_base_url='/static/generated-images',
         gs=_SERVER.gs, truncate_results=_SERVER.truncate_results,
         prefetch_only=prefetch_only, download_all_images=download_all_images)
     if prefetch_only:
       self.send_response(200)
     else:
       self.send_json_dict(results_obj.get_packaged_results_of_type(
-          results_mod.KEY__HEADER__RESULTS_ALL))
+          results_type=results_mod.KEY__HEADER__RESULTS_ALL))
 
   def do_GET_live_results(self, url_remainder):
     """ Handle a GET request for live-generated image diff data.
 
     Args:
       url_remainder: string indicating which image diffs to generate
     """
     logging.debug('do_GET_live_results: url_remainder="%s"' % url_remainder)
     self._get_live_results_or_prefetch(
         url_remainder=url_remainder, prefetch_only=False)
@@ skipping 252 matching lines @@
                    reload_seconds=args.reload, config_pairs=config_pairs,
                    builder_regex_list=args.builders, boto_file_path=args.boto,
                    imagediffdb_threads=args.threads)
   if args.truncate:
     _SERVER.truncate_results = True
   _SERVER.run()
 
 
 if __name__ == '__main__':
   main()