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

Side by Side Diff: chrome/test/webdriver/automation.cc

Issue 7104085: In chromedriver, add /log handler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years, 6 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
OLDNEW
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 #include "chrome/test/webdriver/automation.h" 5 #include "chrome/test/webdriver/automation.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 FilePath(), // template_user_data 163 FilePath(), // template_user_data
164 ProxyLauncher::DEFAULT_THEME, 164 ProxyLauncher::DEFAULT_THEME,
165 command, 165 command,
166 true, // include_testing_id 166 true, // include_testing_id
167 true // show_window 167 true // show_window
168 }; 168 };
169 169
170 std::string chrome_details = base::StringPrintf( 170 std::string chrome_details = base::StringPrintf(
171 "Using Chrome binary at: %" PRFilePath, 171 "Using Chrome binary at: %" PRFilePath,
172 browser_exe.value().c_str()); 172 browser_exe.value().c_str());
173 VLOG(1) << chrome_details; 173 LOG(INFO) << chrome_details;
174 174
175 if (!launcher_->LaunchBrowserAndServer(launch_props, true)) { 175 if (!launcher_->LaunchBrowserAndServer(launch_props, true)) {
176 *error = new Error( 176 *error = new Error(
177 kUnknownError, 177 kUnknownError,
178 "Unable to either launch or connect to Chrome. Please check that " 178 "Unable to either launch or connect to Chrome. Please check that "
179 "ChromeDriver is up-to-date. " + chrome_details); 179 "ChromeDriver is up-to-date. " + chrome_details);
180 return; 180 return;
181 } 181 }
182 182
183 launcher_->automation()->set_action_timeout_ms(base::kNoTimeout); 183 launcher_->automation()->set_action_timeout_ms(base::kNoTimeout);
184 VLOG(1) << "Chrome launched successfully. Version: " 184 LOG(INFO) << "Chrome launched successfully. Version: "
185 << automation()->server_version(); 185 << automation()->server_version();
186 186
187 bool has_automation_version = false; 187 bool has_automation_version = false;
188 *error = CompareVersion(730, 0, &has_automation_version); 188 *error = CompareVersion(730, 0, &has_automation_version);
189 if (*error) 189 if (*error)
190 return; 190 return;
191 191
192 chrome_details += ", version (" + automation()->server_version() + ")"; 192 chrome_details += ", version (" + automation()->server_version() + ")";
193 if (has_automation_version) { 193 if (has_automation_version) {
194 int version = 0; 194 int version = 0;
195 std::string error_msg; 195 std::string error_msg;
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 768, 0, "Alerts are not supported for this version of Chrome"); 656 768, 0, "Alerts are not supported for this version of Chrome");
657 } 657 }
658 658
659 Error* Automation::CheckAdvancedInteractionsSupported() { 659 Error* Automation::CheckAdvancedInteractionsSupported() {
660 const char* message = 660 const char* message =
661 "Advanced user interactions are not supported for this version of Chrome"; 661 "Advanced user interactions are not supported for this version of Chrome";
662 return CheckVersion(750, 0, message); 662 return CheckVersion(750, 0, message);
663 } 663 }
664 664
665 } // namespace webdriver 665 } // namespace webdriver
OLDNEW
« no previous file with comments | « chrome/test/automation/automation_json_requests.cc ('k') | chrome/test/webdriver/chromedriver_tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698