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

net/tools/testserver/run_testserver.cc

 // 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.
 
 #include <stdio.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 29 matching lines @@
 
   sync_test_path =
       sync_test_path.Append(FILE_PATH_LITERAL("chromiumsync_test.py"));
   FilePath python_runtime;
   if (!GetPythonRunTime(&python_runtime)) {
     LOG(ERROR) << "Could not get python runtime command.";
     return false;
   }
 
   CommandLine python_command(python_runtime);
+
+  // Use unbuffered output, so that testserver output doesn't mix with gtest
+  // output in test log files. See http://crbug.com/147368.
+  python_command.AppendArg("-u");
+
   python_command.AppendArgPath(sync_test_path);
   if (!base::LaunchProcess(python_command, base::LaunchOptions(), NULL)) {
     LOG(ERROR) << "Failed to launch test script.";
     return false;
   }
   return true;
 }
 
 // Gets a port value from the switch with name |switch_name| and writes it to
 // |port|. Returns true if successful and false otherwise.
@@ skipping 115 matching lines @@
         UTF16ToUTF8(test_server->document_root().LossyDisplayName()).c_str());
     return -1;
   }
 
   printf("testserver running at %s (type ctrl+c to exit)\n",
          test_server->host_port_pair().ToString().c_str());
 
   message_loop.Run();
   return 0;
 }