rebaseline_server: allow live queries to examine JSONKEY_EXPECTEDRESULTS or JSONKEY_ACTUALRESULTS

gm/rebaseline_server/compare_rendered_pictures_test.py

 #!/usr/bin/python
 
 """
 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Test compare_rendered_pictures.py
 
 TODO(epoger): Create a command to update the expected results (in
 self._output_dir_expected) when appropriate.  For now, you should:
 1. examine the results in self.output_dir_actual and make sure they are ok
 2. rm -rf self._output_dir_expected
 3. mv self.output_dir_actual self._output_dir_expected
 Although, if you're using an SVN checkout, this will blow away .svn directories
 within self._output_dir_expected, which wouldn't be good...
 
 """
 
 # System-level imports
 import os
+import posixpath
 import subprocess
 
 # Must fix up PYTHONPATH before importing from within Skia
 import fix_pythonpath  # pylint: disable=W0611
 
 # Imports from within Skia
 import base_unittest
 import compare_rendered_pictures
 import find_run_binary
 import gm_json
@@ skipping 17 matching lines @@
     self._generate_skps_and_run_render_pictures(
         subdir=setB_label, skpdict={
             'changed.skp': 201,
             'unchanged.skp': 100,
             'only-in-after.skp': 128,
         })
 
     results_obj = compare_rendered_pictures.RenderedPicturesComparisons(
         setA_dirs=[os.path.join(self.temp_dir, setA_label)],
         setB_dirs=[os.path.join(self.temp_dir, setB_label)],
+        setA_section=gm_json.JSONKEY_ACTUALRESULTS,
+        setB_section=gm_json.JSONKEY_ACTUALRESULTS,
         image_diff_db=imagediffdb.ImageDiffDB(self.temp_dir),
         image_base_gs_url='gs://fakebucket/fake/path',
         diff_base_url='/static/generated-images',
         setA_label=setA_label, setB_label=setB_label)
     results_obj.get_timestamp = mock_get_timestamp
 
     gm_json.WriteToFile(
         results_obj.get_packaged_results_of_type(
             results.KEY__HEADER__RESULTS_ALL),
         os.path.join(self.output_dir_actual, 'compare_rendered_pictures.json'))
 
   def test_repo_url(self):
     """Use repo: URL to specify summary files."""
+    base_repo_url = 'repo:gm/rebaseline_server/testdata/inputs/skp-summaries'
     results_obj = compare_rendered_pictures.RenderedPicturesComparisons(
-        setA_dirs=[
-            'repo:gm/rebaseline_server/testdata/inputs/skp-actuals/setA'],
-        setB_dirs=[
-            'repo:gm/rebaseline_server/testdata/inputs/skp-actuals/setB'],
+        setA_dirs=[posixpath.join(base_repo_url, 'expectations')],
+        setB_dirs=[posixpath.join(base_repo_url, 'actuals')],

[rmistry, 2014/08/07 18:57:05]

Side question: about the posixpath.joins, the rebaseline server is not meant to
be run on windows?

[epoger, 2014/08/07 19:03:18]

It should work on Windows (not that I've tried it).

The repo_urls are treated like any URL--they use posixpath forward-slashes.

+        setA_section=gm_json.JSONKEY_EXPECTEDRESULTS,
+        setB_section=gm_json.JSONKEY_ACTUALRESULTS,
         image_diff_db=imagediffdb.ImageDiffDB(self.temp_dir),
         image_base_gs_url='gs://fakebucket/fake/path',
         diff_base_url='/static/generated-images',
         setA_label='setA', setB_label='setB')
     results_obj.get_timestamp = mock_get_timestamp
 
     gm_json.WriteToFile(
         results_obj.get_packaged_results_of_type(
             results.KEY__HEADER__RESULTS_ALL),
         os.path.join(self.output_dir_actual, 'compare_rendered_pictures.json'))
@@ skipping 49 matching lines @@
   """Mock version of BaseComparisons.get_timestamp() for testing."""
   return 12345678
 
 
 def main():
   base_unittest.main(CompareRenderedPicturesTest)
 
 
 if __name__ == '__main__':
   main()