summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 18:41:18 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 18:41:18 +0000
commitc799519cc0806faa5001a9d07badc2cbdf1c97bb (patch)
treeabfad202fe88def23831d092457d244d4ab37a8b /chrome/test/ui/ui_test.cc
parentd8c6cabdea33f84a488f529bb027491739b2fb6e (diff)
downloadchromium_src-c799519cc0806faa5001a9d07badc2cbdf1c97bb.zip
chromium_src-c799519cc0806faa5001a9d07badc2cbdf1c97bb.tar.gz
chromium_src-c799519cc0806faa5001a9d07badc2cbdf1c97bb.tar.bz2
GTTF: After timeout, all further automation calls should fail immediately.
If IPC send fails, further automation calls are extremely likely to fail. Avoid wasting a lot of time on further timeouts by closing the channel immediately on the first error. TEST=ui_tests BUG=51346 Review URL: http://codereview.chromium.org/3131020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
-rw-r--r--chrome/test/ui/ui_test.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 0fc08ad..b321ebf 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -265,8 +265,7 @@ void UITestBase::InitializeTimeouts() {
}
AutomationProxy* UITestBase::CreateAutomationProxy(int execution_timeout) {
- // By default we create a plain vanilla AutomationProxy.
- return new AutomationProxy(execution_timeout);
+ return new AutomationProxy(execution_timeout, false);
}
void UITestBase::LaunchBrowserAndServer() {
@@ -1540,3 +1539,11 @@ void UITest::TearDown() {
UITestBase::TearDown();
PlatformTest::TearDown();
}
+
+AutomationProxy* UITest::CreateAutomationProxy(int execution_timeout) {
+ // Make the AutomationProxy disconnect the channel on the first error,
+ // so that we avoid spending a lot of time in timeouts. The browser is likely
+ // hosed if we hit those errors.
+ return new AutomationProxy(execution_timeout, true);
+}
+