Add Paths as first-class types in configs.

scripts/slave/unittests/recipe_configs_test.py

 #!/usr/bin/python
 # Copyright 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.
 
 """Provides test coverage for common recipe configurations.
 
 recipe config expectations are located in ../recipe_configs_test/*.expected
 
 In training mode, this will loop over every config item in ../recipe_configs.py
 crossed with every platform, and spit out the as_json() representation to
 ../recipe_configs_test
 
 You must have 100% coverage of ../recipe_configs.py for this test to pass.
 """
 
 import json
 import multiprocessing
 import os
 import sys
 import unittest
 from itertools import product, imap
 
 import test_env  # pylint: disable=W0611,F0401
 
 from slave import recipe_loader
 from slave import recipe_util
+from slave import recipe_config_types
 
 import coverage
 
 SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__))
 SLAVE_DIR = os.path.abspath(os.path.join(SCRIPT_PATH, os.pardir))
 
 COVERAGE = (lambda: coverage.coverage(
     include=[os.path.join(x, '*', '*config.py')
              for x in recipe_util.MODULE_DIRS()],
     data_suffix=True))()
@@ skipping 55 matching lines @@
   except Exception, e:
     print 'Caught exception [%s] with args %s: %s' % (e, args, config_name)
 
 
 def train_from_tests(args):
   file_name, _, configuration_results = evaluate_configurations(args)
   if configuration_results is not None:
     if configuration_results:
       print 'Writing', file_name
       with open(file_name, 'wb') as f:
-        json.dump(configuration_results, f, sort_keys=True, indent=2)
+        json.dump(configuration_results, f, sort_keys=True, indent=2,
+                  default=recipe_config_types.json_fixup)
     else:
       print 'Empty', file_name
 
   if not configuration_results:  # None or {}
     if os.path.exists(file_name):
       os.unlink(file_name)
   return True
 
 
 def load_tests(loader, _standard_tests, _pattern):
@@ skipping 10 matching lines @@
 
     class RecipeConfigsTest(unittest.TestCase):
       def testNoLeftovers(self):
         """add_test_methods() should completely drain json_expectation."""
         self.assertEqual(json_expectation, {})
 
       @classmethod
       def add_test_methods(cls):
         for name, result in configuration_results.iteritems():
           def add_test(name, result, expected_result):
+            # Roundtrip json to get same string encoding as load
+            result = json.loads(
+              json.dumps(result, default=recipe_config_types.json_fixup))
             def test_(self):
               self.assertEqual(result, expected_result)
             test_.__name__ += name
             setattr(cls, test_.__name__, test_)
           add_test(name, result, json_expectation.pop(name, {}))
 
     RecipeConfigsTest.add_test_methods()
 
     RecipeConfigsTest.__name__ += test_name_suffix
     return RecipeConfigsTest
@@ skipping 89 matching lines @@
       retcode = retcode or 2
 
   if training:
     test_env.print_coverage_warning()
 
   return retcode
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))