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

Index: content/public/test/browser_test_utils.cc
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index ed0379d0aa7afcae979eee9f83ddf3ecc9ea80a5..e8e29a9186827a9b48911a35546f80df42a8db2d 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -544,6 +544,11 @@ CommandLine* TestWebSocketServer::CreateWebSocketServerCommandLine() {
   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;
 }