Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: content/public/test/browser_test_utils.cc

Issue 10907162: Reland: Take 2: Force python test server output to be unbuffered, so it doesn't mix with gtest outpu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make GetPythonRunTime take a CommandLine instead of a FilePath. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..c19060e5ddfbac55d8be02e28ac14791e039e1f9 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -514,9 +514,9 @@ bool TestWebSocketServer::Start(const FilePath& root_directory) {
CommandLine* TestWebSocketServer::CreatePythonCommandLine() {
// Note: Python's first argument must be the script; do not append CommandLine
// switches, as they would precede the script path and break this CommandLine.
- FilePath path;
- CHECK(GetPythonRunTime(&path));
- return new CommandLine(path);
+ CommandLine* cmd_line = new CommandLine(CommandLine::NO_PROGRAM);
+ CHECK(GetPythonRunTime(cmd_line));
Paweł Hajdan Jr. 2012/09/12 10:37:25 nit: Please add a TODO(phajdan.jr) here to convert
Raghu Simha 2012/09/12 18:31:20 Done.
+ return cmd_line;
}
void TestWebSocketServer::SetPythonPath() {

Powered by Google App Engine
This is Rietveld 408576698