[Telemetry] Fix credentials tests on windows.

On windows you can't open a file for reading while it is still open for writing.
This patch makes sure we close the file for writing before reading it.

BUG=243955
TEST=python tools\telemetry\run_tests Credentials
NOTRY=True

Review URL: https://chromiumcodereview.appspot.com/15778007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202248 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 8 deletions

diff --git a/tools/telemetry/telemetry/core/browser_credentials_unittest.py b/tools/telemetry/telemetry/core/browser_credentials_unittest.py
index d451208..cd77aed 100644
--- a/tools/telemetry/telemetry/core/browser_credentials_unittest.py
+++ b/tools/telemetry/telemetry/core/browser_credentials_unittest.py
@@ -1,8 +1,9 @@
 # Copyright (c) 2012 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.
-import unittest
+import os
 import tempfile
+import unittest
 
 from telemetry.core import browser_credentials
 
@@ -36,9 +37,9 @@ class TestBrowserCredentials(unittest.TestCase):
     browser_cred = browser_credentials.BrowserCredentials(
       [google_backend,
        othersite_backend])
-    with tempfile.NamedTemporaryFile() as f:
-      f.write(SIMPLE_CREDENTIALS_STRING)
-      f.flush()
+    try:
+      with tempfile.NamedTemporaryFile(delete=False) as f:
+        f.write(SIMPLE_CREDENTIALS_STRING)
 
       browser_cred.credentials_path = f.name
 
@@ -66,3 +67,5 @@ class TestBrowserCredentials(unittest.TestCase):
       browser_cred.LoginNoLongerNeeded(tab, 'google')
       self.assertTrue(google_backend.login_no_longer_needed_called is not None)
       self.assertEqual(tab, google_backend.login_no_longer_needed_called[0])
+    finally:
+      os.remove(f.name)
diff --git a/tools/telemetry/telemetry/page/page_runner_unittest.py b/tools/telemetry/telemetry/page/page_runner_unittest.py
index 84cf243..0bea653 100644
--- a/tools/telemetry/telemetry/page/page_runner_unittest.py
+++ b/tools/telemetry/telemetry/page/page_runner_unittest.py
@@ -113,10 +113,10 @@ class PageRunnerTests(unittest.TestCase):
 
     did_run = [False]
 
-    with tempfile.NamedTemporaryFile() as f:
-      f.write(SIMPLE_CREDENTIALS_STRING)
-      f.flush()
-      ps.credentials_path = f.name
+    try:
+      with tempfile.NamedTemporaryFile(delete=False) as f:
+        f.write(SIMPLE_CREDENTIALS_STRING)
+        ps.credentials_path = f.name
 
       class TestThatInstallsCredentialsBackend(page_test.PageTest):
         def __init__(self, credentials_backend):
@@ -134,6 +134,8 @@ class PageRunnerTests(unittest.TestCase):
         options = options_for_unittests.GetCopy()
         possible_browser = browser_finder.FindBrowser(options)
         runner.Run(options, possible_browser, test, results)
+    finally:
+      os.remove(f.name)
 
     return did_run[0]