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

content/public/test/browser_test_utils.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 "content/public/test/browser_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 526 matching lines @@
   PathService::Get(base::DIR_SOURCE_ROOT, &src_path);
 
   FilePath script_path(src_path);
   script_path = script_path.AppendASCII("third_party");
   script_path = script_path.AppendASCII("WebKit");
   script_path = script_path.AppendASCII("Tools");
   script_path = script_path.AppendASCII("Scripts");
   script_path = script_path.AppendASCII("new-run-webkit-websocketserver");
 
   CommandLine* cmd_line = CreatePythonCommandLine();
+
+  // Use unbuffered output, so that testserver output doesn't mix with gtest
+  // output in test log files. See http://crbug.com/147368.
+  cmd_line->AppendArg("-u");

[Paweł Hajdan Jr., 2012/09/11 08:57:31]

Why not in CreatePythonCommandLine?

In fact, to reduce code duplication, how about changing GetPythonRunTime from
returning FilePath to returning CommandLine, and using the -u switch there? You
could add a parameter to control it, e.g. STDIO_BUFFERED, STDIO_UNBUFFERED.

[Raghu Simha, 2012/09/11 21:58:04]

Done.
Can you think of any place where we will want to use STDIO_BUFFERED? From what I
understand, we will need to add the -u arg to python at every place where a
chrome test invokes the python runtime, i.e., at every place where
GetPythonRunTime is called.

+
   cmd_line->AppendArgPath(script_path);
   return cmd_line;
 }
 
 TestWebSocketServer::~TestWebSocketServer() {
   if (!started_)
     return;
   // Append CommandLine arguments after the server script, switches won't work.
   scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
   cmd_line->AppendArg("--server=stop");
   cmd_line->AppendArg("--chromium");
   cmd_line->AppendArgNative(FILE_PATH_LITERAL("--pidfile=") +
                             websocket_pid_file_.value());
   base::LaunchOptions options;
   options.wait = true;
   base::LaunchProcess(*cmd_line.get(), options, NULL);
 
 #if defined(OS_POSIX)
   // Just to make sure that the server process terminates certainly.
   if (process_group_id_ != base::kNullProcessHandle)
     base::KillProcessGroup(process_group_id_);
 #endif
 }
 
 }  // namespace content