new tool: download all GM images for a given builder, ready for skdiff

BUG=skia:1919
R=rmistry@google.com, bsalomon@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/143653006

git-svn-id: http://skia.googlecode.com/svn/trunk@13172 2bbb7eff-a529-9590-31e7-b0007b416f81

31 files changed, 403 insertions, 0 deletions

diff --git a/gm/gm_json.py b/gm/gm_json.py
index 7cd4455f79..1aac6632f5 100644
--- a/gm/gm_json.py
+++ b/gm/gm_json.py
@@ -104,6 +104,8 @@ def CreateGmActualUrl(test_name, hash_type, hash_digest,
   hash_digest: the hash digest of the image to retrieve
   gm_actuals_root_url: root url where actual images are stored
   """
+  # TODO(epoger): Maybe use url_or_path.join() so that, for testing, this can
+  # return either a URL or a local filepath?
   return '%s/%s/%s/%s.png' % (gm_actuals_root_url, hash_type, test_name,
                               hash_digest)
 
diff --git a/gm/rebaseline_server/download_actuals.py b/gm/rebaseline_server/download_actuals.py
new file mode 100755
index 0000000000..3f3f640f12
--- /dev/null
+++ b/gm/rebaseline_server/download_actuals.py
@@ -0,0 +1,201 @@
+#!/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.
+
+Download actual GM results for a particular builder.
+"""
+
+# System-level imports
+import contextlib
+import optparse
+import os
+import posixpath
+import re
+import shutil
+import sys
+import urllib
+import urllib2
+import urlparse
+
+# Imports from within Skia
+#
+# We need to add the 'gm' and 'tools' directories, so that we can import
+# gm_json.py and buildbot_globals.py.
+#
+# Make sure that these dirs are in the PYTHONPATH, but add them at the *end*
+# so any dirs that are already in the PYTHONPATH will be preferred.
+#
+# TODO(epoger): Is it OK for this to depend on the 'tools' dir, given that
+# the tools dir is dependent on the 'gm' dir (to import gm_json.py)?
+TRUNK_DIRECTORY = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+GM_DIRECTORY = os.path.join(TRUNK_DIRECTORY, 'gm')
+TOOLS_DIRECTORY = os.path.join(TRUNK_DIRECTORY, 'tools')
+if GM_DIRECTORY not in sys.path:
+  sys.path.append(GM_DIRECTORY)
+if TOOLS_DIRECTORY not in sys.path:
+  sys.path.append(TOOLS_DIRECTORY)
+import buildbot_globals
+import gm_json
+
+DEFAULT_ACTUALS_BASE_URL = posixpath.join(
+    buildbot_globals.Get('autogen_svn_url'), 'gm-actual')
+DEFAULT_JSON_FILENAME = 'actual-results.json'
+
+
+class Download(object):
+
+  def __init__(self, actuals_base_url=DEFAULT_ACTUALS_BASE_URL,
+               json_filename=DEFAULT_JSON_FILENAME,
+               gm_actuals_root_url=gm_json.GM_ACTUALS_ROOT_HTTP_URL):
+    """
+    Args:
+      actuals_base_url: URL pointing at the root directory
+          containing all actual-results.json files, e.g.,
+          http://domain.name/path/to/dir  OR
+          file:///absolute/path/to/localdir
+      json_filename: The JSON filename to read from within each directory.
+      gm_actuals_root_url: Base URL under which the actually-generated-by-bots
+          GM images are stored.
+    """
+    self._actuals_base_url = actuals_base_url
+    self._json_filename = json_filename
+    self._gm_actuals_root_url = gm_actuals_root_url
+    self._image_filename_re = re.compile(gm_json.IMAGE_FILENAME_PATTERN)
+
+  def fetch(self, builder_name, dest_dir):
+    """ Downloads actual GM results for a particular builder.
+
+    Args:
+      builder_name: which builder to download results of
+      dest_dir: path to directory where the image files will be written;
+                if the directory does not exist yet, it will be created
+
+    TODO(epoger): Display progress info.  Right now, it can take a long time
+    to download all of the results, and there is no indication of progress.
+
+    TODO(epoger): Download multiple images in parallel to speed things up.
+    """
+    json_url = posixpath.join(self._actuals_base_url, builder_name,
+                              self._json_filename)
+    json_contents = urllib2.urlopen(json_url).read()
+    results_dict = gm_json.LoadFromString(json_contents)
+
+    actual_results_dict = results_dict[gm_json.JSONKEY_ACTUALRESULTS]
+    for result_type in sorted(actual_results_dict.keys()):
+      results_of_this_type = actual_results_dict[result_type]
+      if not results_of_this_type:
+        continue
+      for image_name in sorted(results_of_this_type.keys()):
+        (test, config) = self._image_filename_re.match(image_name).groups()
+        (hash_type, hash_digest) = results_of_this_type[image_name]
+        source_url = gm_json.CreateGmActualUrl(
+            test_name=test, hash_type=hash_type, hash_digest=hash_digest,
+            gm_actuals_root_url=self._gm_actuals_root_url)
+        dest_path = os.path.join(dest_dir, config, test + '.png')
+        copy_contents(source_url=source_url, dest_path=dest_path,
+                      create_subdirs_if_needed=True)
+
+
+def create_filepath_url(filepath):
+  """ Returns a file:/// URL pointing at the given filepath on local disk.
+
+  For now, this is only used by unittests, but I anticipate it being useful
+  in production, as a way for developers to run rebaseline_server over locally
+  generated images.
+
+  TODO(epoger): Move this function, and copy_contents(), into a shared
+  utility module.  They are generally useful.
+
+  Args:
+    filepath: string; path to a file on local disk (may be absolute or relative,
+        and the file does not need to exist)
+
+  Returns:
+    A file:/// URL pointing at the file.  Regardless of whether filepath was
+        specified as a relative or absolute path, the URL will contain an
+        absolute path to the file.
+
+  Raises:
+    An Exception, if filepath is already a URL.
+  """
+  if urlparse.urlparse(filepath).scheme:
+    raise Exception('"%s" is already a URL' % filepath)
+  return urlparse.urljoin(
+      'file:', urllib.pathname2url(os.path.abspath(filepath)))
+
+
+def copy_contents(source_url, dest_path, create_subdirs_if_needed=False):
+  """ Copies the full contents of the URL 'source_url' into
+  filepath 'dest_path'.
+
+  Args:
+    source_url: string; complete URL to read from
+    dest_path: string; complete filepath to write to (may be absolute or
+        relative)
+    create_subdirs_if_needed: boolean; whether to create subdirectories as
+        needed to create dest_path
+
+  Raises:
+    Some subclass of Exception if unable to read source_url or write dest_path.
+  """
+  if create_subdirs_if_needed:
+    dest_dir = os.path.dirname(dest_path)
+    if not os.path.exists(dest_dir):
+      os.makedirs(dest_dir)
+  with contextlib.closing(urllib.urlopen(source_url)) as source_handle:
+    with open(dest_path, 'wb') as dest_handle:
+      shutil.copyfileobj(fsrc=source_handle, fdst=dest_handle)
+
+
+def main():
+  parser = optparse.OptionParser()
+  required_params = []
+  parser.add_option('--actuals-base-url',
+                    action='store', type='string',
+                    default=DEFAULT_ACTUALS_BASE_URL,
+                    help=('Base URL from which to read files containing JSON '
+                          'summaries of actual GM results; defaults to '
+                          '"%default". To get a specific revision (useful for '
+                          'trybots) replace "svn" with "svn-history/r123".'))
+  # TODO(epoger): Rather than telling the user to run "svn ls" to get the list
+  # of builders, add a --list-builders option that will print the list.
+  required_params.append('builder')
+  parser.add_option('--builder',
+                    action='store', type='string',
+                    help=('REQUIRED: Which builder to download results for. '
+                          'To see a list of builders, run "svn ls %s".' %
+                          DEFAULT_ACTUALS_BASE_URL))
+  required_params.append('dest_dir')
+  parser.add_option('--dest-dir',
+                    action='store', type='string',
+                    help=('REQUIRED: Directory where all images should be '
+                          'written. If this directory does not exist yet, it '
+                          'will be created.'))
+  parser.add_option('--json-filename',
+                    action='store', type='string',
+                    default=DEFAULT_JSON_FILENAME,
+                    help=('JSON summary filename to read for each builder; '
+                          'defaults to "%default".'))
+  (params, remaining_args) = parser.parse_args()
+
+  # Make sure all required options were set,
+  # and that there were no items left over in the command line.
+  for required_param in required_params:
+    if not getattr(params, required_param):
+      raise Exception('required option \'%s\' was not set' % required_param)
+  if len(remaining_args) is not 0:
+    raise Exception('extra items specified in the command line: %s' %
+                    remaining_args)
+
+  downloader = Download(actuals_base_url=params.actuals_base_url)
+  downloader.fetch(builder_name=params.builder,
+                   dest_dir=params.dest_dir)
+
+
+
+if __name__ == '__main__':
+  main()
diff --git a/gm/rebaseline_server/download_actuals_test.py b/gm/rebaseline_server/download_actuals_test.py
new file mode 100755
index 0000000000..aeb1dce47f
--- /dev/null
+++ b/gm/rebaseline_server/download_actuals_test.py
@@ -0,0 +1,168 @@
+#!/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 download.py
+
+TODO(epoger): Create a command to update the expected results (in
+OUTPUT_DIR_EXPECTED) when appropriate.  For now, you should:
+1. examine the results in OUTPUT_DIR_ACTUAL and make sure they are ok
+2. rm -rf OUTPUT_DIR_EXPECTED
+3. mv OUTPUT_DIR_ACTUAL OUTPUT_DIR_EXPECTED
+Although, if you're using an SVN checkout, this will blow away .svn directories
+within OUTPUT_DIR_EXPECTED, which wouldn't be good...
+
+"""
+
+# System-level imports
+import filecmp
+import os
+import shutil
+import tempfile
+import unittest
+import urllib
+
+# Imports from within Skia
+import download_actuals
+
+PARENT_DIR = os.path.dirname(os.path.realpath(__file__))
+INPUT_DIR = os.path.join(PARENT_DIR, 'tests', 'inputs')
+OUTPUT_DIR_ACTUAL   = os.path.join(PARENT_DIR, 'tests', 'outputs', 'actual')
+OUTPUT_DIR_EXPECTED = os.path.join(PARENT_DIR, 'tests', 'outputs', 'expected')
+
+
+class DownloadTest(unittest.TestCase):
+
+  def setUp(self):
+    self._temp_dir = tempfile.mkdtemp()
+    self._output_dir_actual   = os.path.join(OUTPUT_DIR_ACTUAL, self.id())
+    self._output_dir_expected = os.path.join(OUTPUT_DIR_EXPECTED, self.id())
+    create_empty_dir(self._output_dir_actual)
+
+  def tearDown(self):
+    shutil.rmtree(self._temp_dir)
+    if os.path.exists(self._output_dir_expected):
+      different_files = find_different_files(self._output_dir_actual,
+                                             self._output_dir_expected)
+      # Maybe we should move this assert elsewhere?  It's unusual to see an
+      # assert within tearDown(), but my thinking was:
+      # 1. Every test case will have some collection of output files that need
+      #    to be validated.
+      # 2. So put that validation within tearDown(), which will be called after
+      #    every test case!
+      #
+      # I have confirmed that the test really does fail if this assert is
+      # triggered.
+      #
+      # Ravi notes: if somebody later comes along and adds cleanup code below
+      # this assert, then if tests fail, the artifacts will not be cleaned up.
+      assert (not different_files), \
+        ('found differing files between actual dir %s and expected dir %s: %s' %
+         (self._output_dir_actual, self._output_dir_expected, different_files))
+
+  def shortDescription(self):
+    """Tell unittest framework to not print docstrings for test cases."""
+    return None
+
+  def test_fetch(self):
+    """Tests fetch() of GM results from actual-results.json ."""
+    downloader = download_actuals.Download(
+        actuals_base_url=download_actuals.create_filepath_url(
+            os.path.join(INPUT_DIR, 'gm-actuals')),
+        gm_actuals_root_url=download_actuals.create_filepath_url(
+            os.path.join(INPUT_DIR, 'fake-gm-imagefiles')))
+    downloader.fetch(
+        builder_name='Test-Android-GalaxyNexus-SGX540-Arm7-Release',
+        dest_dir=self._output_dir_actual)
+
+  def test_create_filepath_url(self):
+    """Tests create_filepath_url(). """
+    with self.assertRaises(Exception):
+      url_or_path.create_filepath_url('http://1.2.3.4/path')
+    # Pass absolute filepath.
+    self.assertEquals(
+        download_actuals.create_filepath_url(
+            '%sdir%sfile' % (os.path.sep, os.path.sep)),
+        'file:///dir/file')
+    # Pass relative filepath.
+    self.assertEquals(
+        download_actuals.create_filepath_url(os.path.join('dir', 'file')),
+        'file://%s/dir/file' % urllib.pathname2url(os.getcwd()))
+
+  def test_copy_contents(self):
+    """Tests copy_contents(). """
+    contents = 'these are the contents'
+    tempdir_path = tempfile.mkdtemp()
+    try:
+      source_path = os.path.join(tempdir_path, 'source')
+      source_url = download_actuals.create_filepath_url(source_path)
+      with open(source_path, 'w') as source_handle:
+        source_handle.write(contents)
+      dest_path = os.path.join(tempdir_path, 'new_subdir', 'dest')
+      # Destination subdir does not exist, so copy_contents() should fail
+      # if create_subdirs_if_needed is False.
+      with self.assertRaises(Exception):
+        download_actuals.copy_contents(source_url=source_url,
+                                       dest_path=dest_path,
+                                       create_subdirs_if_needed=False)
+      # If create_subdirs_if_needed is True, it should work.
+      download_actuals.copy_contents(source_url=source_url,
+                                     dest_path=dest_path,
+                                     create_subdirs_if_needed=True)
+      self.assertEquals(open(dest_path).read(), contents)
+    finally:
+      shutil.rmtree(tempdir_path)
+
+
+# TODO(epoger): create_empty_dir(), find_different_files(), etc. should be
+# extracted from this file to some common location, where they can be shared
+# with results_test.py and other users.
+
+def create_empty_dir(path):
+  """Create an empty directory at the given path."""
+  if os.path.isdir(path):
+    shutil.rmtree(path)
+  elif os.path.lexists(path):
+    os.remove(path)
+  os.makedirs(path)
+
+
+def find_different_files(dir1, dir2, ignore_subtree_names=None):
+  """Returns a list of any files that differ between the directory trees rooted
+  at dir1 and dir2.
+
+  Args:
+    dir1: root of a directory tree; if nonexistent, will raise OSError
+    dir2: root of another directory tree; if nonexistent, will raise OSError
+    ignore_subtree_names: list of subtree directory names to ignore;
+          defaults to ['.svn'], so all SVN files are ignores
+
+  TODO(epoger): include the dirname within each filename (not just the
+  basename), to make it easier to locate any differences
+  """
+  differing_files = []
+  if ignore_subtree_names is None:
+    ignore_subtree_names = ['.svn']
+  dircmp = filecmp.dircmp(dir1, dir2, ignore=ignore_subtree_names)
+  differing_files.extend(dircmp.left_only)
+  differing_files.extend(dircmp.right_only)
+  differing_files.extend(dircmp.common_funny)
+  differing_files.extend(dircmp.diff_files)
+  differing_files.extend(dircmp.funny_files)
+  for common_dir in dircmp.common_dirs:
+    differing_files.extend(find_different_files(
+        os.path.join(dir1, common_dir), os.path.join(dir2, common_dir)))
+  return differing_files
+
+
+def main():
+  suite = unittest.TestLoader().loadTestsFromTestCase(DownloadTest)
+  unittest.TextTestRunner(verbosity=2).run(suite)
+
+
+if __name__ == '__main__':
+  main()
diff --git a/gm/rebaseline_server/results_test.py b/gm/rebaseline_server/results_test.py
index 8263f58920..bfb0c8375a 100755
--- a/gm/rebaseline_server/results_test.py
+++ b/gm/rebaseline_server/results_test.py
@@ -77,6 +77,10 @@ class ResultsTest(unittest.TestCase):
                         os.path.join(self._output_dir_actual, 'gm.json'))
 
 
+# TODO(epoger): create_empty_dir(), find_different_files(), etc. should be
+# extracted from this file to some common location, where they can be shared
+# with download_test.py and other users.
+
 def create_empty_dir(path):
   """Create an empty directory at the given path."""
   if os.path.isdir(path):
diff --git a/gm/rebaseline_server/tests/.gitattributes b/gm/rebaseline_server/tests/.gitattributes
new file mode 100644
index 0000000000..3606445cad
--- /dev/null
+++ b/gm/rebaseline_server/tests/.gitattributes
@@ -0,0 +1,2 @@
+# All self-test PNG files are fake (human-readable, diffable plaintext files).
+*.png    text diff -binary
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png
new file mode 100644
index 0000000000..d3686ff12d
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png
new file mode 100644
index 0000000000..656275a920
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/aaclip/14456211900777561488.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/aaclip/14456211900777561488.png
new file mode 100644
index 0000000000..371a172ece
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/aaclip/14456211900777561488.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/aaclip/14456211900777561488.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/aaclip/6190901827590820995.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/aaclip/6190901827590820995.png
new file mode 100644
index 0000000000..8a01aa825f
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/aaclip/6190901827590820995.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/aaclip/6190901827590820995.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bigblurs/17309852422285247848.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bigblurs/17309852422285247848.png
new file mode 100644
index 0000000000..2d78e89be3
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bigblurs/17309852422285247848.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/bigblurs/17309852422285247848.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bigblurs/2422083043229439955.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bigblurs/2422083043229439955.png
new file mode 100644
index 0000000000..8d0646720a
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bigblurs/2422083043229439955.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/bigblurs/2422083043229439955.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bitmapsource/16289727936158057543.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bitmapsource/16289727936158057543.png
new file mode 100644
index 0000000000..3c511d5f6a
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bitmapsource/16289727936158057543.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/bitmapsource/16289727936158057543.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bitmapsource/17503582803589749280.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bitmapsource/17503582803589749280.png
new file mode 100644
index 0000000000..d2df08ca3a
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/bitmapsource/17503582803589749280.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/bitmapsource/17503582803589749280.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_192_192/3154864687054945306.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_192_192/3154864687054945306.png
new file mode 100644
index 0000000000..9364ccdd8a
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_192_192/3154864687054945306.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/filterbitmap_checkerboard_192_192/3154864687054945306.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_192_192/4719210487426381700.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_192_192/4719210487426381700.png
new file mode 100644
index 0000000000..5c91d33e15
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_192_192/4719210487426381700.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/filterbitmap_checkerboard_192_192/4719210487426381700.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_32_2/15528304435129737588.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_32_2/15528304435129737588.png
new file mode 100644
index 0000000000..3c1de492de
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_32_2/15528304435129737588.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/filterbitmap_checkerboard_32_2/15528304435129737588.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_32_2/712827739969462165.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_32_2/712827739969462165.png
new file mode 100644
index 0000000000..8760be33fb
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/filterbitmap_checkerboard_32_2/712827739969462165.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/filterbitmap_checkerboard_32_2/712827739969462165.png
diff --git a/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/texdata/3695033638604474475.png b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/texdata/3695033638604474475.png
new file mode 100644
index 0000000000..fee415c72a
--- /dev/null
+++ b/gm/rebaseline_server/tests/inputs/fake-gm-imagefiles/bitmap-64bitMD5/texdata/3695033638604474475.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/texdata/3695033638604474475.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/3x3bitmaprect.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/3x3bitmaprect.png
new file mode 100644
index 0000000000..d3686ff12d
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/3x3bitmaprect.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/3x3bitmaprect/16998423976396106083.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/aaclip.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/aaclip.png
new file mode 100644
index 0000000000..8a01aa825f
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/aaclip.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/aaclip/6190901827590820995.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/bigblurs.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/bigblurs.png
new file mode 100644
index 0000000000..8d0646720a
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/bigblurs.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/bigblurs/2422083043229439955.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/bitmapsource.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/bitmapsource.png
new file mode 100644
index 0000000000..d2df08ca3a
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/bitmapsource.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/bitmapsource/17503582803589749280.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/filterbitmap_checkerboard_192_192.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/filterbitmap_checkerboard_192_192.png
new file mode 100644
index 0000000000..5c91d33e15
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/filterbitmap_checkerboard_192_192.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/filterbitmap_checkerboard_192_192/4719210487426381700.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/filterbitmap_checkerboard_32_2.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/filterbitmap_checkerboard_32_2.png
new file mode 100644
index 0000000000..3c1de492de
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/565/filterbitmap_checkerboard_32_2.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/filterbitmap_checkerboard_32_2/15528304435129737588.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/3x3bitmaprect.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/3x3bitmaprect.png
new file mode 100644
index 0000000000..656275a920
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/3x3bitmaprect.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/3x3bitmaprect/2054956815327187963.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/aaclip.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/aaclip.png
new file mode 100644
index 0000000000..371a172ece
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/aaclip.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/aaclip/14456211900777561488.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/bigblurs.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/bigblurs.png
new file mode 100644
index 0000000000..2d78e89be3
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/bigblurs.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/bigblurs/17309852422285247848.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/bitmapsource.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/bitmapsource.png
new file mode 100644
index 0000000000..3c511d5f6a
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/bitmapsource.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/bitmapsource/16289727936158057543.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/filterbitmap_checkerboard_192_192.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/filterbitmap_checkerboard_192_192.png
new file mode 100644
index 0000000000..9364ccdd8a
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/filterbitmap_checkerboard_192_192.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/filterbitmap_checkerboard_192_192/3154864687054945306.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/filterbitmap_checkerboard_32_2.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/filterbitmap_checkerboard_32_2.png
new file mode 100644
index 0000000000..8760be33fb
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/8888/filterbitmap_checkerboard_32_2.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/filterbitmap_checkerboard_32_2/712827739969462165.png
diff --git a/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/gpu/texdata.png b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/gpu/texdata.png
new file mode 100644
index 0000000000..fee415c72a
--- /dev/null
+++ b/gm/rebaseline_server/tests/outputs/expected/download_actuals_test.DownloadTest.test_fetch/gpu/texdata.png
@@ -0,0 +1 @@
+contents of bitmap-64bitMD5/texdata/3695033638604474475.png