summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steve Block <steveblock@google.com> 2011-02-10 12:13:27 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-02-10 12:13:27 -0800
commitfb40a64d806a64c075a3d91bbbd68aaff27e741c (patch)
treeba2719c94527541e34c93ba3efdce26f12458641
parent96bad1390115db294e3ff1aafc82d20fd19b0007 (diff)
parent8e8cf732d1ba39ca21b6ffb593e939709bc5b0a1 (diff)
Merge "Increase DRT timeout while waiting for WebView to dump as text"
-rw-r--r--tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
index 3ea491133ccc..9c0a4bceef0e 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -941,7 +941,7 @@ public class TestShellActivity extends Activity implements LayoutTestController
private boolean mDumpWebKitData = false;
static final String TIMEOUT_STR = "**Test timeout";
- static final long DUMP_TIMEOUT_MS = 20000; //20s timeout for dumping webview content
+ static final long DUMP_TIMEOUT_MS = 100000; // 100s timeout for dumping webview content
static final int MSG_TIMEOUT = 0;
static final int MSG_WEBKIT_DATA = 1;