Domain Reliability: Reenable AddBakedInConfigs test

components/domain_reliability/bake_in_configs.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 
 """Takes the JSON files in components/domain_reliability/baked_in_configs and
 encodes their contents as an array of C strings that gets compiled in to Chrome
 and loaded at runtime."""
 
@@ skipping 515 matching lines @@
 
   json_files = read_json_files_from_gypi(gypi_file)
 
   cpp_code = CC_HEADER
   found_invalid_config = False
   for json_file in json_files:
     with open(json_file, 'r') as f:
       json_text = f.read()
     try:
       config = json.loads(json_text)
-    except ValueError:
-      print >> sys.stderr, "%s: error parsing JSON" % json_file
-      raise
+    except ValueError, e:
+      print >> sys.stderr, "%s: error parsing JSON: %s" % (json_file, e)
+      found_invalid_config = True
+      continue

[davidben, 2014/10/20 20:51:31]

Nit: could you add a sentence about this in the CL description? It doesn't seem
related to re-enabling it. (I suppose it could also be split out, but whatever.)

[Deprecated (see juliatuttle), 2014/10/20 21:07:47]

Done.

     if 'monitored_domain' not in config:
       print >> sys.stderr, '%s: no monitored_domain found' % json_file
       found_invalid_config = True
       continue
     domain = config['monitored_domain']
     if not domain_is_whitelisted(domain):
       print >> sys.stderr, ('%s: monitored_domain "%s" not in whitelist' %
                             (json_file, domain))
       found_invalid_config = True
       continue
     cpp_code += "  // " + json_file + ":\n"
     cpp_code += quote_and_wrap_text(json_text) + ",\n"
     cpp_code += "\n"
   cpp_code += CC_FOOTER
 
   if found_invalid_config:
     return 1

[davidben, 2014/10/20 20:51:31]

Does the build still fail if this happens? It seems we shouldn't have the build
continue with invalid files. Or is the intent here just so you get all the
errors in one go?

[Deprecated (see juliatuttle), 2014/10/20 21:07:47]

Yes, this is main, and it's wrapped in sys.exit below, so it will fail if any
files were invalid, but it makes sure it prints *all* the failures, not just the
first one.

 
   with open(cpp_file, 'wb') as f:
     f.write(cpp_code)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())