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

Side by Side Diff: net/test/local_test_server_posix.cc

Issue 10905087: Revert 154861 - Run safebrowsing_service_test through the net testserver code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/test/local_test_server.cc ('k') | net/test/local_test_server_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/test/local_test_server.h" 5 #include "net/test/local_test_server.h"
6 6
7 #include <poll.h> 7 #include <poll.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 namespace net { 95 namespace net {
96 96
97 bool LocalTestServer::LaunchPython(const FilePath& testserver_path) { 97 bool LocalTestServer::LaunchPython(const FilePath& testserver_path) {
98 // Log is useful in the event you want to run a nearby script (e.g. a test) in 98 // Log is useful in the event you want to run a nearby script (e.g. a test) in
99 // the same environment as the TestServer. 99 // the same environment as the TestServer.
100 VLOG(1) << "LaunchPython called with PYTHONPATH = " << 100 VLOG(1) << "LaunchPython called with PYTHONPATH = " <<
101 getenv(kPythonPathEnv); 101 getenv(kPythonPathEnv);
102 CommandLine python_command(FilePath(FILE_PATH_LITERAL("python"))); 102 CommandLine python_command(FilePath(FILE_PATH_LITERAL("python")));
103 103
104 AddPythonArguments(testserver_path, &python_command); 104 python_command.AppendArgPath(testserver_path);
105
106 if (!AddCommandLineArguments(&python_command)) 105 if (!AddCommandLineArguments(&python_command))
107 return false; 106 return false;
108 107
109 int pipefd[2]; 108 int pipefd[2];
110 if (pipe(pipefd) != 0) { 109 if (pipe(pipefd) != 0) {
111 PLOG(ERROR) << "Could not create pipe."; 110 PLOG(ERROR) << "Could not create pipe.";
112 return false; 111 return false;
113 } 112 }
114 113
115 // Save the read half. The write half is sent to the child. 114 // Save the read half. The write half is sent to the child.
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 161
163 if (!ParseServerData(server_data)) { 162 if (!ParseServerData(server_data)) {
164 LOG(ERROR) << "Could not parse server_data: " << server_data; 163 LOG(ERROR) << "Could not parse server_data: " << server_data;
165 return false; 164 return false;
166 } 165 }
167 166
168 return true; 167 return true;
169 } 168 }
170 169
171 } // namespace net 170 } // namespace net
OLDNEW
« no previous file with comments | « net/test/local_test_server.cc ('k') | net/test/local_test_server_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698