Reland: Take 2: Force python test server output to be unbuffered, so it doesn't mix with gtest output

In browser tests that use a local python server, the python output in
the test logs sometimes overlaps with gtest output, resulting in gtest
falsely detecting passing tests as incomplete. This is a result of
python's default use of buffered output, which gets written to the log
file out of order.

This patch forces the python process for local test servers to use
unbuffered mode via the -u switch. This way, by the time gtest is ready
to log a passing test, all testserver output is already written to the
log file.

Update: The win xp bots were adversely affected by the -u switch, so we now
apply it only for mac and linux, which is where the original problem was found.

BUG=147368
TEST=See sync integration test output when it is redirected to a log file, and make sure there are no false negatives.

Originally committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=156361

Review URL: https://codereview.chromium.org/10907162

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

1 files changed, 3 insertions, 3 deletions

diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc
index c02d4d6..9ad0f7d 100644
--- a/net/tools/testserver/run_testserver.cc
+++ b/net/tools/testserver/run_testserver.cc
@@ -40,13 +40,13 @@ static bool RunSyncTest() {
 
   sync_test_path =
       sync_test_path.Append(FILE_PATH_LITERAL("chromiumsync_test.py"));
-  FilePath python_runtime;
-  if (!GetPythonRunTime(&python_runtime)) {
+
+  CommandLine python_command(CommandLine::NO_PROGRAM);
+  if (!GetPythonCommand(&python_command)) {
     LOG(ERROR) << "Could not get python runtime command.";
     return false;
   }
 
-  CommandLine python_command(python_runtime);
   python_command.AppendArgPath(sync_test_path);
   if (!base::LaunchProcess(python_command, base::LaunchOptions(), NULL)) {
     LOG(ERROR) << "Failed to launch test script.";