OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // This test uses the safebrowsing test server published at | 5 // This test uses the safebrowsing test server published at |
6 // http://code.google.com/p/google-safe-browsing/ to test the safebrowsing | 6 // http://code.google.com/p/google-safe-browsing/ to test the safebrowsing |
7 // protocol implemetation. Details of the safebrowsing testing flow is | 7 // protocol implemetation. Details of the safebrowsing testing flow is |
8 // documented at | 8 // documented at |
9 // http://code.google.com/p/google-safe-browsing/wiki/ProtocolTesting | 9 // http://code.google.com/p/google-safe-browsing/wiki/ProtocolTesting |
10 // | 10 // |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 cmd_line.AppendArgNative(FILE_PATH_LITERAL("--datafile=") + | 145 cmd_line.AppendArgNative(FILE_PATH_LITERAL("--datafile=") + |
146 datafile.value()); | 146 datafile.value()); |
147 | 147 |
148 base::LaunchOptions options; | 148 base::LaunchOptions options; |
149 #if defined(OS_WIN) | 149 #if defined(OS_WIN) |
150 options.start_hidden = true; | 150 options.start_hidden = true; |
151 #endif | 151 #endif |
152 options.process_handle = &server_handle_; | 152 options.process_handle = &server_handle_; |
153 if (!base::LaunchProcess(cmd_line, options)) { | 153 if (!base::LaunchProcess(cmd_line, options)) { |
154 LOG(ERROR) << "Failed to launch server: " | 154 LOG(ERROR) << "Failed to launch server: " |
155 << cmd_line.command_line_string(); | 155 << cmd_line.GetCommandLineString(); |
156 return false; | 156 return false; |
157 } | 157 } |
158 return true; | 158 return true; |
159 } | 159 } |
160 | 160 |
161 // Stop the python server test suite. | 161 // Stop the python server test suite. |
162 bool Stop() { | 162 bool Stop() { |
163 if (server_handle_ == base::kNullProcessHandle) | 163 if (server_handle_ == base::kNullProcessHandle) |
164 return true; | 164 return true; |
165 | 165 |
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 } | 637 } |
638 | 638 |
639 // Verifies with server if test is done and waits till server responses. | 639 // Verifies with server if test is done and waits till server responses. |
640 EXPECT_EQ(net::URLRequestStatus::SUCCESS, | 640 EXPECT_EQ(net::URLRequestStatus::SUCCESS, |
641 safe_browsing_helper->VerifyTestComplete(server_host, | 641 safe_browsing_helper->VerifyTestComplete(server_host, |
642 server_port, | 642 server_port, |
643 last_step)); | 643 last_step)); |
644 EXPECT_EQ("yes", safe_browsing_helper->response_data()); | 644 EXPECT_EQ("yes", safe_browsing_helper->response_data()); |
645 test_server.Stop(); | 645 test_server.Stop(); |
646 } | 646 } |
OLD | NEW |