Add Paths as first-class types in configs.

scripts/slave/unittests/recipes_test.py

 #!/usr/bin/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.
 
 """Provides test coverage for individual recipes.
 
 Recipe tests are located in ../recipes_test/*.py.
 
 Each py file's splitext'd name is expected to match a recipe in ../recipes/*.py.
@@ skipping 34 matching lines @@
 
 import test_env  # pylint: disable=F0401,W0611
 
 import coverage
 
 import common.python26_polyfill  # pylint: disable=W0611
 import unittest
 
 from common import annotator
 from slave import recipe_util
+from slave import recipe_config_types
 from slave import annotated_run
 from slave import recipe_loader
 
 SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__))
 ROOT_PATH = os.path.abspath(os.path.join(SCRIPT_PATH, os.pardir, os.pardir,
                                          os.pardir))
 SLAVE_DIR = os.path.join(ROOT_PATH, 'slave', 'fake_slave', 'build')
 
 BASE_DIRS = recipe_util.BASE_DIRS
 COVERAGE = None
@@ skipping 42 matching lines @@
   try:
     props = test_data.properties
     props['recipe'] = recipe_name
 
     stream = annotator.StructuredAnnotationStream(stream=open(os.devnull, 'w'))
 
     def api(*args, **kwargs):
       return recipe_loader.CreateRecipeApi(test_data=test_data, *args, **kwargs)
 
     with cover():
+      recipe_config_types.ResetTostringFns()
       step_data = annotated_run.run_steps(
         stream, props, props, api, test_data).steps_ran.values()
       return [s.step for s in step_data]
   except:
     print 'Exception while processing "%s"!' % recipe_path
     raise
 
 
 def train_from_tests((recipe_path, recipe_name)):
   for path in glob(expected_for(recipe_path, '*')):
     os.unlink(path)
 
   for test_data in exec_test_file(recipe_path):
     steps = execute_test_case(test_data, recipe_path, recipe_name)
     expected_path = expected_for(recipe_path, test_data.name)
     print 'Writing', expected_path
     with open(expected_path, 'wb') as f:
-      json.dump(steps, f, sort_keys=True, indent=2, separators=(',', ': '))
+      json.dump(steps, f, sort_keys=True, indent=2, separators=(',', ': '),
+                default=recipe_config_types.json_fixup)
 
   return True
 
 
 def load_tests(loader, _standard_tests, _pattern):
   """This method is invoked by unittest.main's automatic testloader."""
   def create_test_class((recipe_path, recipe_name)):
     class RecipeTest(unittest.TestCase):
       @classmethod
       def add_test_methods(cls):
         for test_data in exec_test_file(recipe_path):
           expected_path = expected_for(recipe_path, test_data.name)
           def add_test(test_data, expected_path, recipe_name):
             def test_(self):
               steps = execute_test_case(test_data, recipe_path, recipe_name)
               # Roundtrip json to get same string encoding as load
-              steps = json.loads(json.dumps(steps))
+              steps = json.loads(
+                json.dumps(steps, default=recipe_config_types.json_fixup))
               with open(expected_path, 'rb') as f:
                 expected = json.load(f)
               self.assertEqual(steps, expected)
             test_.__name__ += test_data.name
             setattr(cls, test_.__name__, test_)
           add_test(test_data, expected_path, recipe_name)
 
     RecipeTest.add_test_methods()
 
     RecipeTest.__name__ += '_for_%s' % (
@@ skipping 54 matching lines @@
       retcode = retcode or 2
 
   if training:
     test_env.print_coverage_warning()
 
   return retcode
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))