Although there appear to be one or two tests that are flaky on both mac and linux.
Review URL: http://codereview.chromium.org/6681019
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@77955 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 5f3418f..1c1b204 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -692,7 +692,7 @@
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')
@@ -725,6 +725,7 @@
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):