make unit tests pass on the mac

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."""
 
 # pylint: disable=E1101,E1103,W0403
 
 # Import before super_mox to keep valid references.
@@ skipping 674 matching lines @@
     self.assertEquals(sorted(file_list), expected_file_list)
     self.checkstdout(
         ('\n________ running \'git diff --name-status '
          '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\nM\tb\n') %
             join(self.root_dir, '.'))
 
   def testUpdateCheckout(self):
     if not self.enabled:
       return
     options = self.Options(verbose=True)
-    root_dir = tempfile.mkdtemp()
+    root_dir = gclient_scm.os.path.realpath(tempfile.mkdtemp())
     relpath = 'foo'
     base_path = join(root_dir, relpath)
     url = join(self.base_path, '.git')
     try:
       scm = gclient_scm.CreateSCM(url=url, root_dir=root_dir,
                                   relpath=relpath)
       file_list = []
       scm.update(options, (), file_list)
       self.assertEquals(len(file_list), 2)
       self.assert_(gclient_scm.os.path.isfile(join(base_path, 'a')))
@@ skipping 12 matching lines @@
     msg2 = (
         "\n_____ foo at refs/heads/master\n\n"
         "________ running 'git clone -b master --verbose %s %s' in '%s'\n"
         "Cloning into %s...\ndone.\n") % (
           join(self.root_dir, '.', '.git'),
           join(root_dir, 'foo'),
           root_dir,
           join(gclient_scm.os.path.realpath(root_dir), 'foo'))
     out = sys.stdout.getvalue()
     sys.stdout.close()
+    sys.stdout = self._old_stdout
     self.assertTrue(out in (msg1, msg2), (out, msg1, msg2))
 
   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 = []
@@ skipping 84 matching lines @@
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: