Commit fe0c8c33 authored by Wei-Yin Chen (陳威尹)'s avatar Wei-Yin Chen (陳威尹) Committed by Commit Bot

Disable flaky Site Isolation tests on Android

The following tests are disabled:
- RenderFrameHostManagerDefaultProcessTest.NavigationRacesWithSitelessCommitInDefaultProcess
- RenderFrameHostManagerTest.NavigationRacesWithCommitInUnassignedSiteInstance

TBR=acolwell@chromium.org

Bug: 1110497
Change-Id: I13306e727f7544e49f1fed393c678f21fd2f575b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2324559Reviewed-by: default avatarWei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792595}
parent 0547b4ce
...@@ -7558,13 +7558,22 @@ class CommitMessageDelayer : public DidCommitNavigationInterceptor { ...@@ -7558,13 +7558,22 @@ class CommitMessageDelayer : public DidCommitNavigationInterceptor {
} // namespace } // namespace
// TODO(crbug.com/1110497): flaky on Android builders since 2020-07-28.
#if defined(OS_ANDROID)
#define MAYBE_NavigationRacesWithCommitInUnassignedSiteInstance \
DISABLED_NavigationRacesWithCommitInUnassignedSiteInstance
#else
#define MAYBE_NavigationRacesWithCommitInUnassignedSiteInstance \
NavigationRacesWithCommitInUnassignedSiteInstance
#endif
// Check that when a navigation to a URL that doesn't require assigning a site // Check that when a navigation to a URL that doesn't require assigning a site
// URL is in progress, another navigation can't reuse the same process in the // URL is in progress, another navigation can't reuse the same process in the
// meantime. Such reuse previously led to a renderer kill when the siteless // meantime. Such reuse previously led to a renderer kill when the siteless
// URL later committed; a real-world example of the siteless URL was // URL later committed; a real-world example of the siteless URL was
// chrome-native://newtab. See https://crbug.com/970046. // chrome-native://newtab. See https://crbug.com/970046.
IN_PROC_BROWSER_TEST_P(RenderFrameHostManagerTest, IN_PROC_BROWSER_TEST_P(
NavigationRacesWithCommitInUnassignedSiteInstance) { RenderFrameHostManagerTest,
MAYBE_NavigationRacesWithCommitInUnassignedSiteInstance) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
// Set up a URL for which ShouldAssignSiteForURL will return false. The // Set up a URL for which ShouldAssignSiteForURL will return false. The
...@@ -7735,6 +7744,14 @@ class RenderFrameHostManagerDefaultProcessTest ...@@ -7735,6 +7744,14 @@ class RenderFrameHostManagerDefaultProcessTest
DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManagerDefaultProcessTest); DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManagerDefaultProcessTest);
}; };
// TODO(crbug.com/1110497): flaky on Android builders since 2020-07-28.
#if defined(OS_ANDROID)
#define MAYBE_NavigationRacesWithSitelessCommitInDefaultProcess \
DISABLED_NavigationRacesWithSitelessCommitInDefaultProcess
#else
#define MAYBE_NavigationRacesWithSitelessCommitInDefaultProcess \
NavigationRacesWithSitelessCommitInDefaultProcess
#endif
// Ensure that the default process can be used for URLs that don't assign a site // Ensure that the default process can be used for URLs that don't assign a site
// to the SiteInstance, when Site Isolation is not enabled. // to the SiteInstance, when Site Isolation is not enabled.
// 1. Visit foo.com. // 1. Visit foo.com.
...@@ -7744,8 +7761,9 @@ class RenderFrameHostManagerDefaultProcessTest ...@@ -7744,8 +7761,9 @@ class RenderFrameHostManagerDefaultProcessTest
// https://crbug.com/838348.) // https://crbug.com/838348.)
// All navigations should use the default process, and we should not crash. // All navigations should use the default process, and we should not crash.
// See https://crbug.com/977956. // See https://crbug.com/977956.
IN_PROC_BROWSER_TEST_P(RenderFrameHostManagerDefaultProcessTest, IN_PROC_BROWSER_TEST_P(
NavigationRacesWithSitelessCommitInDefaultProcess) { RenderFrameHostManagerDefaultProcessTest,
MAYBE_NavigationRacesWithSitelessCommitInDefaultProcess) {
// This test is designed to run without strict site isolation. // This test is designed to run without strict site isolation.
if (AreAllSitesIsolatedForTesting()) if (AreAllSitesIsolatedForTesting())
return; return;
......
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