Fall back to our own codereview settings if a key is not found in gcl's settings.

tests/gclient_scm_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 """Unit tests for gclient_scm.py."""
 
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
@@ skipping 713 matching lines @@
       self.assert_(gclient_scm.os.path.isfile(join(base_path, 'a')))
       self.assertEquals(scm.revinfo(options, (), None),
                         '069c602044c5388d2d15c3f875b057c852003458')
     finally:
       rmtree(root_dir)
     self.checkstdout(
         ('\n_____ foo at refs/heads/master\n\n'
          '________ running \'git clone -b master --verbose %s %s\' in \'%s\'\n'
          'Initialized empty Git repository in %s\n') %
             (join(self.root_dir, '.', '.git'), join(root_dir, 'foo'), root_dir,
-             join(root_dir, 'foo', '.git') + '/'))
+             join(gclient_scm.os.path.realpath(root_dir), 'foo', '.git') + '/'))
 
   def testUpdateUpdate(self):
     if not self.enabled:
       return
     options = self.Options()
     expected_file_list = [join(self.base_path, x) for x in ['a', 'b']]
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, (), file_list)
@@ skipping 72 matching lines @@
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     rev_info = scm.revinfo(options, (), None)
     self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: