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

Unified Diff: gm/rebaseline_server/compare_rendered_pictures_test.py

Issue 453433004: rebaseline_server: allow live queries to examine JSONKEY_EXPECTEDRESULTS or JSONKEY_ACTUALRESULTS (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: create ALLOWED_SECTION_NAMES Created 6 years, 4 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
Index: gm/rebaseline_server/compare_rendered_pictures_test.py
diff --git a/gm/rebaseline_server/compare_rendered_pictures_test.py b/gm/rebaseline_server/compare_rendered_pictures_test.py
index c6e0e79c2b308757e0e5c426db68eba23658af36..e761c8a5c2dd37defaa8855e1eed75b8f0892606 100755
--- a/gm/rebaseline_server/compare_rendered_pictures_test.py
+++ b/gm/rebaseline_server/compare_rendered_pictures_test.py
@@ -20,6 +20,7 @@ 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
@@ -57,6 +58,8 @@ class CompareRenderedPicturesTest(base_unittest.TestCase):
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',
@@ -70,11 +73,12 @@ class CompareRenderedPicturesTest(base_unittest.TestCase):
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 reba
epoger 2014/08/07 19:03:18 It should work on Windows (not that I've tried it)
+ 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',

Powered by Google App Engine
This is Rietveld 408576698