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

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

Issue 6995060: Change timeout for all ChromeDriver automation calls to infinite (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Simpler way to set timeout for all ChromeDriver automation calls to infinite. 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 browser_exe.value().c_str()); 171 browser_exe.value().c_str());
172 VLOG(1) << chrome_details; 172 VLOG(1) << chrome_details;
173 173
174 if (!launcher_->LaunchBrowserAndServer(launch_props, true)) { 174 if (!launcher_->LaunchBrowserAndServer(launch_props, true)) {
175 *error = new Error( 175 *error = new Error(
176 kUnknownError, 176 kUnknownError,
177 "Unable to either launch or connect to Chrome. Please check that " 177 "Unable to either launch or connect to Chrome. Please check that "
178 "ChromeDriver is up-to-date. " + chrome_details); 178 "ChromeDriver is up-to-date. " + chrome_details);
179 return; 179 return;
180 } 180 }
181 // set action_timeout_ms to infinite
kkania 2011/06/08 00:54:53 remove
Huyen 2011/06/08 00:59:34 Done.
182 launcher_->automation()->set_action_timeout_ms(base::kNoTimeout);
181 VLOG(1) << "Chrome launched successfully. Version: " 183 VLOG(1) << "Chrome launched successfully. Version: "
182 << automation()->server_version(); 184 << automation()->server_version();
183 185
184 bool has_automation_version = false; 186 bool has_automation_version = false;
185 *error = CompareVersion(730, 0, &has_automation_version); 187 *error = CompareVersion(730, 0, &has_automation_version);
186 if (*error) 188 if (*error)
187 return; 189 return;
188 190
189 chrome_details += ", version (" + automation()->server_version() + ")"; 191 chrome_details += ", version (" + automation()->server_version() + ")";
190 if (has_automation_version) { 192 if (has_automation_version) {
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 768, 0, "Alerts are not supported for this version of Chrome"); 655 768, 0, "Alerts are not supported for this version of Chrome");
654 } 656 }
655 657
656 Error* Automation::CheckAdvancedInteractionsSupported() { 658 Error* Automation::CheckAdvancedInteractionsSupported() {
657 const char* message = 659 const char* message =
658 "Advanced user interactions are not supported for this version of Chrome"; 660 "Advanced user interactions are not supported for this version of Chrome";
659 return CheckVersion(750, 0, message); 661 return CheckVersion(750, 0, message);
660 } 662 }
661 663
662 } // namespace webdriver 664 } // namespace webdriver
OLDNEW
« chrome/test/webdriver/automation.h ('K') | « chrome/test/webdriver/automation.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698