Commit de83b74a authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Commit Bot

webview: re-enable SSL tests.

Re-enable these to see what errors they report via the newly added
logging, since this failure doesn't seem to be reproducible.

Bug: 1106472
Bug: 1117289
Change-Id: I70c7341a53a0c79a3edf29588ece4fe7d1a06220
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2399523
Auto-Submit: Richard Coles <torne@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805434}
parent fc7c1bd5
...@@ -6,7 +6,6 @@ package org.chromium.android_webview.test; ...@@ -6,7 +6,6 @@ package org.chromium.android_webview.test;
import static org.chromium.android_webview.test.AwActivityTestRule.WAIT_TIMEOUT_MS; import static org.chromium.android_webview.test.AwActivityTestRule.WAIT_TIMEOUT_MS;
import android.os.Build.VERSION_CODES;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
import android.webkit.JavascriptInterface; import android.webkit.JavascriptInterface;
...@@ -24,7 +23,6 @@ import org.chromium.android_webview.AwContents; ...@@ -24,7 +23,6 @@ import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.AwContentsClient.AwWebResourceRequest; import org.chromium.android_webview.AwContentsClient.AwWebResourceRequest;
import org.chromium.android_webview.test.TestAwContentsClient.OnReceivedSslErrorHelper; import org.chromium.android_webview.test.TestAwContentsClient.OnReceivedSslErrorHelper;
import org.chromium.base.BuildInfo; import org.chromium.base.BuildInfo;
import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.net.test.EmbeddedTestServer; import org.chromium.net.test.EmbeddedTestServer;
import org.chromium.net.test.ServerCertificate; import org.chromium.net.test.ServerCertificate;
...@@ -60,8 +58,6 @@ public class AwNetworkConfigurationTest { ...@@ -60,8 +58,6 @@ public class AwNetworkConfigurationTest {
@SmallTest @SmallTest
@Feature({"AndroidWebView", "Network"}) @Feature({"AndroidWebView", "Network"})
// clang-format off // clang-format off
@DisableIf.Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1,
sdk_is_less_than = VERSION_CODES.N, hardware_is = "flo")
public void testSHA1LocalAnchorsAllowed() throws Throwable { public void testSHA1LocalAnchorsAllowed() throws Throwable {
// clang-format on // clang-format on
mTestServer = EmbeddedTestServer.createAndStartHTTPSServer( mTestServer = EmbeddedTestServer.createAndStartHTTPSServer(
......
...@@ -17,11 +17,9 @@ import org.junit.runner.RunWith; ...@@ -17,11 +17,9 @@ import org.junit.runner.RunWith;
import org.chromium.android_webview.AwContents; import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.test.TestAwContentsClient.OnReceivedSslErrorHelper; import org.chromium.android_webview.test.TestAwContentsClient.OnReceivedSslErrorHelper;
import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.net.test.EmbeddedTestServer; import org.chromium.net.test.EmbeddedTestServer;
import org.chromium.net.test.ServerCertificate; import org.chromium.net.test.ServerCertificate;
import org.chromium.ui.test.util.UiDisableIf;
/** /**
* SslError tests. * SslError tests.
...@@ -50,7 +48,6 @@ public class SslPreferencesTest { ...@@ -50,7 +48,6 @@ public class SslPreferencesTest {
@Test @Test
@Feature({"AndroidWebView"}) @Feature({"AndroidWebView"})
@SmallTest @SmallTest
@DisableIf.Device(type = {UiDisableIf.TABLET}) // See https://crbug.com/1117289.
public void testSslErrorNotCalledForOkCert() throws Throwable { public void testSslErrorNotCalledForOkCert() throws Throwable {
mTestServer = EmbeddedTestServer.createAndStartHTTPSServer( mTestServer = EmbeddedTestServer.createAndStartHTTPSServer(
InstrumentationRegistry.getInstrumentation().getContext(), InstrumentationRegistry.getInstrumentation().getContext(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment