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

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: Don't use unbuffered mode on Windows. 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
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_test.cc ('k') | content/test/layout_test_http_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..f49ce9219f9c43afb21de1d4167af04b55f853a4 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -514,9 +514,10 @@ 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);
+ // TODO(phajdan.jr): Instead of CHECKing, return a boolean indicating success.
+ CHECK(GetPythonCommand(cmd_line));
+ return cmd_line;
}
void TestWebSocketServer::SetPythonPath() {
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_test.cc ('k') | content/test/layout_test_http_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698