android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java - Issue 281563002: [Android WebView] Filter out error page URL from onPageFinished to un-flake tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

Issue 281563002: [Android WebView] Filter out error page URL from onPageFinished to un-flake tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed AwContentsTest#testEscapingOfErrorPage Created 6 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 side-by-side diff with in-line comments

Download patch

« android_webview/java/src/org/chromium/android_webview/AwContentsClient.java ('K') | « android_webview/java/src/org/chromium/android_webview/AwContentsClient.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java » ('j') | content/browser/android/web_contents_observer_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

index 01a52a33feaeca33668d2e8bbee80c93678b0fc2..7c3e44b5e1575ad69f7dfbf354e97cab2114f699 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

@@ -421,9 +421,7 @@ public class AwContentsTest extends AwTestBase {

int currentCallCount = onPageFinishedHelper.getCallCount();

loadUrlAsync(awContents,

"file:///file-that-does-not-exist#<script>window.failed = true;</script>");

- // We must wait for two onPageFinished callbacks. One for the original failing URL, and

- // one for the error page that we then display to the user.

- onPageFinishedHelper.waitForCallback(currentCallCount, 2, WAIT_TIMEOUT_MS,

+ onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_MS,

TimeUnit.MILLISECONDS);

assertEquals("false", executeJavaScriptAndWaitForResult(awContents, mContentsClient,