android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java - Issue 1952573002: Add DisableIf annotation to EME test

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/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java

Issue 1952573002: Add DisableIf annotation to EME test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor format changes Created 4 years, 7 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

« no previous file with comments | « android_webview/test/shell/src/org/chromium/android_webview/test/AwInstrumentationTestRunner.java ('k') | android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java » ('j') | base/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java

diff --git a/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java b/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java

index 81a9b7c720554efd9fb8fbf9fb518c0bf366bf09..9aa76a3fba903c10504210477a385dfe86fa4e3a 100644

--- a/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java

+++ b/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java

@@ -11,6 +11,7 @@ import android.test.suitebuilder.annotation.MediumTest;

import junit.framework.ComparisonFailure;

import org.chromium.base.Log;

+import org.chromium.base.test.util.DisableIf;

import org.chromium.webview_shell.WebViewLayoutTestActivity;

import java.io.BufferedReader;

@@ -244,6 +245,7 @@ public class WebViewLayoutTest

}

@MediumTest

+ @DisableIf.Build(product_name_includes = "aosp")

public void testEMEPermission() throws Exception {

mTestActivity.setGrantPermission(true);

runWebViewLayoutTest("blink-apis/eme/eme.html", "blink-apis/eme/eme-expected.txt");