rebaseline_server: allow spaces within test/config names

gm/gm_json.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Schema of the JSON summary file written out by the GM tool.
 
 This must be kept in sync with the kJsonKey_ constants in gm_expectations.cpp !
 """
 
@@ skipping 73 matching lines @@
 #  as a GS URL that allows credential-protected write access:
 GM_ACTUALS_ROOT_GS_URL = 'gs://chromium-skia-gm/gm'
 
 # Root directory where buildbots store skimage actual results json files.
 SKIMAGE_ACTUALS_BASE_URL = (
     'http://chromium-skia-gm.commondatastorage.googleapis.com/skimage/actuals')
 # Root directory inside trunk where skimage expectations are stored.
 SKIMAGE_EXPECTATIONS_ROOT = os.path.join('expectations', 'skimage')
 
 # Pattern used to assemble each image's filename
-IMAGE_FILENAME_PATTERN = '(\S+)_(\S+)\.png'  # matches (testname, config)
+IMAGE_FILENAME_PATTERN = '(.+)_(.+)\.png'  # matches (testname, config)
 
 def CreateGmActualUrl(test_name, hash_type, hash_digest,
                       gm_actuals_root_url=GM_ACTUALS_ROOT_HTTP_URL):
   """Return the URL we can use to download a particular version of
   the actually-generated image for this particular GM test.
 
   test_name: name of the test, e.g. 'perlinnoise'
   hash_type: string indicating the hash type used to generate hash_digest,
              e.g. JSONKEY_HASHTYPE_BITMAP_64BITMD5
   hash_digest: the hash digest of the image to retrieve
@@ skipping 20 matching lines @@
   return LoadFromString(file_contents)
 
 def WriteToFile(json_dict, file_path):
   """Writes the JSON summary in json_dict out to file_path.
 
   The file is written Unix-style (each line ends with just LF, not CRLF);
   see https://code.google.com/p/skia/issues/detail?id=1815 for reasons."""
   with io.open(file_path, mode='w', newline='', encoding='utf-8') as outfile:
     outfile.write(unicode(json.dumps(json_dict, outfile, sort_keys=True,
                                      indent=2)))